From nobody Sat Mar 26 18:31:04 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 01CE31A4A7BC; Sat, 26 Mar 2022 18:31:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KQnbD6Klfz4ps1; Sat, 26 Mar 2022 18:31:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648319464; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J/W/l3NvDsWeaCym1MfgVPaO1fGN5wOOcC9VK7q1pEw=; b=tlnAC85ctV1xM/1msBqfk7j7d6EQwxwJILzPbIDPvbftEh2Lt+f3u3xnaa0K9aQgrFckY+ 00mv/Np/vkQQ0gGMX8lbVpUUqq9c1KDCbPnaWZ6ZkkZ7lljz9zF6P+QigDlW/16UXKXvJx xZP7qVpu6X1xLZHT/eGEeGga6szd9Y4TiDTAgSenKdOsZ0GbNViVZDGjUeI9h10VEf/YXI GwhKLoPvK18M8Wf2z+tjGBaNrGfVcFj29HZv1Xqh2pDuSJK4yFDnckkMTBkI6Qw5E7F1qe 9Ra+vbfocI1FxlMqVGgvsqCaH5OFnaaoBmGe+FD9sNC140exarM+SQkZAgdtEg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B9EDD26211; Sat, 26 Mar 2022 18:31:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22QIV4EU060463; Sat, 26 Mar 2022 18:31:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22QIV4pF060462; Sat, 26 Mar 2022 18:31:04 GMT (envelope-from git) Date: Sat, 26 Mar 2022 18:31:04 GMT Message-Id: <202203261831.22QIV4pF060462@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: a4032e2a694f - main - vfs: assorted tidy ups to lookup List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a4032e2a694fc621dbf7abf9a5f078bec6fa3409 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648319464; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J/W/l3NvDsWeaCym1MfgVPaO1fGN5wOOcC9VK7q1pEw=; b=Q6nE6w5Y5sSmtl0oInn4XPznIwSLqSa7Nu4yghSdU6nEvC8UhLGqLC0lpOffBoy7rZqcWk iMl804tyWmuzIqYDTiXDk3bMPtSE0rGPBjucmvFh6mCbsMfu8TdhsvAFXqvbf354QG3f1G eJJ8gkAEeKR6DxGT3fBF0AG28Hbzwn4b8mNPj/dDV0jnayGLspHw1GPGwnT32E3NxYClIJ p2ec5er5Tw1ix4cqbZLk8nw14vGWwGBZbssy00bl0rwVvzHKpSMRP7bpXH7swEkxN55yap ZI6mC1TJ1zQ5h8UhhWyaQf43W+KFgN+9WagPk97YV/jiGIZOGsYbghBnU2ZOdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648319464; a=rsa-sha256; cv=none; b=NR8PlbjvbbvZODjitk/l/2sr9AI7pZzlA6k51IRhXAXJDirlaqUJTuYOLZ3co4czuuLPCg 8S08H5tK7+V+GWku1sQqLocv0LhrsO2iukiYNFEwQ/i8pGTIlsELg7sVWAQeIqIK0V9z8L HW6P065RBx9xIZ/S+MaOg4Jels+8TyPf9W1r7Og/rboAvdWnancuVvgi0N9E+KLStARMK4 +SY6bX+Pd/k5eHueDbiNJj8uS2Zp4ignSEXqJ4UQ1A/2X49SkY2T1bPJGvFLFQe2HTPNY/ 9K558phZ0RcO1QXc+y1fecorM5Hn/6f3LsIL8G3wwDeRiSoLuNR0LIOS2kDK8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=a4032e2a694fc621dbf7abf9a5f078bec6fa3409 commit a4032e2a694fc621dbf7abf9a5f078bec6fa3409 Author: Mateusz Guzik AuthorDate: 2022-03-26 10:26:59 +0000 Commit: Mateusz Guzik CommitDate: 2022-03-26 17:06:09 +0000 vfs: assorted tidy ups to lookup No functional changes. --- sys/kern/vfs_lookup.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c index faef7b6cb254..34ecd91a064d 100644 --- a/sys/kern/vfs_lookup.c +++ b/sys/kern/vfs_lookup.c @@ -1059,7 +1059,7 @@ dirloop: } *nulchar = '\0'; cnp->cn_namelen = cp - cnp->cn_nameptr; - if (cnp->cn_namelen > NAME_MAX) { + if (__predict_false(cnp->cn_namelen > NAME_MAX)) { error = ENAMETOOLONG; goto bad; } @@ -1076,24 +1076,25 @@ dirloop: prev_ni_next = ndp->ni_next; ndp->ni_next = cp; + /* + * Something else should be clearing this. + */ + cnp->cn_flags &= ~(ISDOTDOT|ISLASTCN); + cnp->cn_flags |= MAKEENTRY; if (*cp == '\0' && docache == 0) cnp->cn_flags &= ~MAKEENTRY; if (cnp->cn_namelen == 2 && cnp->cn_nameptr[1] == '.' && cnp->cn_nameptr[0] == '.') cnp->cn_flags |= ISDOTDOT; - else - cnp->cn_flags &= ~ISDOTDOT; - if (*ndp->ni_next == 0) + if (*ndp->ni_next == 0) { cnp->cn_flags |= ISLASTCN; - else - cnp->cn_flags &= ~ISLASTCN; - if ((cnp->cn_flags & ISLASTCN) != 0 && - cnp->cn_namelen == 1 && cnp->cn_nameptr[0] == '.' && - (cnp->cn_nameiop == DELETE || cnp->cn_nameiop == RENAME)) { - error = EINVAL; - goto bad; + if (__predict_false(cnp->cn_namelen == 1 && cnp->cn_nameptr[0] == '.' && + (cnp->cn_nameiop == DELETE || cnp->cn_nameiop == RENAME))) { + error = EINVAL; + goto bad; + } } nameicap_tracker_add(ndp, dp); @@ -1186,7 +1187,7 @@ dirloop: unionlookup: #ifdef MAC error = mac_vnode_check_lookup(cnp->cn_cred, dp, cnp); - if (error) + if (__predict_false(error)) goto bad; #endif ndp->ni_dvp = dp;