From nobody Mon May 05 02:41:32 2025 X-Original-To: dev-commits-src-main@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 4ZrQlJ2BPLz5tj0P; Mon, 05 May 2025 02:41:32 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZrQlJ16mSz3vtr; Mon, 05 May 2025 02:41:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746412892; 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=MtPozajsyQGLW5Ud1Hyg6XJk4ysfOxY36lS/UU5z9qQ=; b=THl6PI2o/mnqueLe8PiNqIpvuzQnx0k/CGUzFxRytpL81lXSahx+tUOVrT2OZLpqChmE3o S9porvPbMFcLKAEoHcO5r3UPker4YQWZkQeYi/uMMOzSWRY0vm1GUQmaj6hdsUHjJF8t9p 7rUIkJa5QJHJY3vCuqPNAyKnxnAIPdeZJtovC+XDIF9NiUOo1tOZPZZx85OFU9tys8iCKa Ogea4fDLlxekucBjZXDC+fE1pUJMRZxkuJB5ZsSE8rqT3LuwxDEtn9zs4SI1pXN2ivuLMV 3WDfNSJIsBeDJ9bX2XOhYR2CeZoykIdREiAt4vCgJVLfwgO3XrebXW/7B7VHjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746412892; 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=MtPozajsyQGLW5Ud1Hyg6XJk4ysfOxY36lS/UU5z9qQ=; b=kI7zKZg/y/iGZfTNCNTGyGrOdWrvegJuRza+1NFCfYgX0opuYHoWQ7r/O83Ly16bPrJpd+ 6LlaSdDYgWrWV8SmCagFTytt5420ywKxS6gQ7dxfk+chJ3oIJ8boX+eWJmde1SRlzuIJ5R ohbj0zEx8Gb1LQndGn91SDxVKDqNwsB7XD4PGaJWP6EsJPT/TfPTTvnmXe82CQK8RkDNG3 qyDuTI3HmPMFvP9hV6daYtb+RpGF8wneuWKnxCGXNaAZkES0Vs6Ahk6xD5dG+DJ/824d2N t25fASFI0n1b1DAVTK3dbLvG73OD9uHm83evErsZXqSg0G6ZRZIJFPCnoe07zg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746412892; a=rsa-sha256; cv=none; b=lZlxgV0CrcsKdZplz26AMGwFRN4UbhMczyO4vtK6dboLWvnOnXbw5Chottk6VQtfvWmm80 ua86tvmPMUyO6J1xOItT7fj+WviHNuK/gJR5jAHHL93+lFo82LWObfWnl5/xXQSWWQQcj6 F0htLLz8c+d4BrUBP+u2p/30DKKujozXPE6fzscXIMYuNHroNDZLY07fzaRKyCdguDsdut aRGnue9Z8uZGrHBiFGqsBeLYj2TwOVilfAQBpfA0APJ9C08Mp6t1eWOJMLJ4LUYvw+CLwx jskXl8uzyYPDPomi37br8xwQDDKQ1AsoxnyogRyiVFiBqW2NsEtoDKJxRy4V5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ZrQlJ0fGlzw01; Mon, 05 May 2025 02:41:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5452fWPe042058; Mon, 5 May 2025 02:41:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5452fWoP042055; Mon, 5 May 2025 02:41:32 GMT (envelope-from git) Date: Mon, 5 May 2025 02:41:32 GMT Message-Id: <202505050241.5452fWoP042055@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 2c0e6f53171c - main - Revert "nfscommon: Use _PC_HAS_NAMEDATTR to check for named attributes" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2c0e6f53171c4c8100235811912444bba08185f4 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=2c0e6f53171c4c8100235811912444bba08185f4 commit 2c0e6f53171c4c8100235811912444bba08185f4 Author: Rick Macklem AuthorDate: 2025-05-05 02:38:44 +0000 Commit: Rick Macklem CommitDate: 2025-05-05 02:38:44 +0000 Revert "nfscommon: Use _PC_HAS_NAMEDATTR to check for named attributes" This reverts commit 9419e086e1a37124d11e428892d60a514e5c579e. --- sys/fs/nfs/nfs_commonsubs.c | 98 +++++++++++++++++++++++++++++++++------------ sys/fs/nfs/nfsproto.h | 2 - 2 files changed, 73 insertions(+), 27 deletions(-) diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c index f3305ccdde80..3e70eb50a54e 100644 --- a/sys/fs/nfs/nfs_commonsubs.c +++ b/sys/fs/nfs/nfs_commonsubs.c @@ -223,6 +223,7 @@ static int nfs_bigreply[NFSV42_NPROCS] = { 0, 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, /* local functions */ static int nfsrv_skipace(struct nfsrv_descript *nd, int *acesizep); +static bool nfs_test_namedattr(struct nfsrv_descript *nd, struct vnode *vp); static void nfsv4_wanted(struct nfsv4lock *lp); static uint32_t nfsv4_filesavail(struct statfs *, struct mount *); static int nfsrv_getuser(int procnum, uid_t uid, gid_t gid, char *name); @@ -1281,6 +1282,70 @@ nfsmout: return (error); } +/* + * Check to see if a named attribute exists for this file. + */ +static bool +nfs_test_namedattr(struct nfsrv_descript *nd, struct vnode *vp) +{ + struct uio io; + struct iovec iv; + struct componentname cn; + struct vnode *dvp; + struct dirent *dp; + int eofflag, error; + char *buf, *cp, *endcp; + bool ret; + + if (vp == NULL || (vp->v_mount->mnt_flag & MNT_NAMEDATTR) == 0) + return (false); + NFSNAMEICNDSET(&cn, nd->nd_cred, LOOKUP, OPENNAMED | ISLASTCN | + NOFOLLOW | LOCKLEAF); + cn.cn_lkflags = LK_SHARED; + cn.cn_nameptr = "."; + cn.cn_namelen = 1; + error = VOP_LOOKUP(vp, &dvp, &cn); + if (error != 0) + return (false); + + /* Now we have to read the directory, looking for a valid entry. */ + buf = malloc(DIRBLKSIZ, M_TEMP, M_WAITOK); + ret = false; + io.uio_offset = 0; + io.uio_segflg = UIO_SYSSPACE; + io.uio_rw = UIO_READ; + io.uio_td = NULL; + do { + iv.iov_base = buf; + iv.iov_len = DIRBLKSIZ; + io.uio_iov = &iv; + io.uio_iovcnt = 1; + io.uio_resid = DIRBLKSIZ; + error = VOP_READDIR(dvp, &io, nd->nd_cred, &eofflag, NULL, + NULL); + if (error != 0 || io.uio_resid == DIRBLKSIZ) + break; + cp = buf; + endcp = &buf[DIRBLKSIZ - io.uio_resid]; + while (cp < endcp) { + dp = (struct dirent *)cp; + if (dp->d_fileno != 0 && dp->d_type != DT_WHT && + ((dp->d_namlen == 1 && dp->d_name[0] != '.') || + (dp->d_namlen == 2 && (dp->d_name[0] != '.' || + dp->d_name[1] != '.')) || dp->d_namlen > 2)) { + ret = true; + break; + } + cp += dp->d_reclen; + } + if (ret) + break; + } while (eofflag == 0); + vput(dvp); + free(buf, M_TEMP); + return (ret); +} + /* * Get the attributes for V4. * If the compare flag is true, test for any attribute changes, @@ -1377,7 +1442,6 @@ nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp, pc->pc_chownrestricted = 0; pc->pc_caseinsensitive = 0; pc->pc_casepreserving = 1; - pc->pc_has_namedattr = false; } if (sfp != NULL) { sfp->sf_ffiles = UINT64_MAX; @@ -1517,25 +1581,13 @@ nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp, break; case NFSATTRBIT_NAMEDATTR: NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED); - if (compare) { - if (!(*retcmpp)) { - long has_named_attr; - - if (vp == NULL || VOP_PATHCONF(vp, - _PC_HAS_NAMEDATTR, &has_named_attr) - != 0) - has_named_attr = 0; - if ((has_named_attr != 0 && - *tl != newnfs_true) || - (has_named_attr == 0 && - *tl != newnfs_false)) - *retcmpp = NFSERR_NOTSAME; - } - } else if (pc != NULL) { - if (*tl == newnfs_true) - pc->pc_has_namedattr = true; - else - pc->pc_has_namedattr = false; + if (compare && !(*retcmpp)) { + bool named_attr; + + named_attr = nfs_test_namedattr(nd, vp); + if ((named_attr && *tl != newnfs_true) || + (!named_attr && *tl != newnfs_false)) + *retcmpp = NFSERR_NOTSAME; } attrsum += NFSX_UNSIGNED; break; @@ -2632,7 +2684,6 @@ nfsv4_fillattr(struct nfsrv_descript *nd, struct mount *mp, vnode_t vp, size_t atsiz; bool xattrsupp; short irflag; - long has_named_attr; #ifdef QUOTA struct dqblk dqb; uid_t savuid; @@ -2789,10 +2840,7 @@ nfsv4_fillattr(struct nfsrv_descript *nd, struct mount *mp, vnode_t vp, break; case NFSATTRBIT_NAMEDATTR: NFSM_BUILD(tl, u_int32_t *, NFSX_UNSIGNED); - if (VOP_PATHCONF(vp, _PC_HAS_NAMEDATTR, &has_named_attr) - != 0) - has_named_attr = 0; - if (has_named_attr != 0) + if (nfs_test_namedattr(nd, vp)) *tl = newnfs_true; else *tl = newnfs_false; diff --git a/sys/fs/nfs/nfsproto.h b/sys/fs/nfs/nfsproto.h index 0a11e906569d..d0660cafdedb 100644 --- a/sys/fs/nfs/nfsproto.h +++ b/sys/fs/nfs/nfsproto.h @@ -1414,7 +1414,6 @@ struct nfsv3_sattr { * NFSGETATTRBIT_PATHCONF0 - bits 0<->31 */ #define NFSGETATTRBIT_PATHCONF0 (NFSATTRBIT_GETATTR0 | \ - NFSATTRBM_NAMEDATTR | \ NFSATTRBM_CASEINSENSITIVE | \ NFSATTRBM_CASEPRESERVING | \ NFSATTRBM_CHOWNRESTRICTED | \ @@ -1646,7 +1645,6 @@ struct nfsv3_pathconf { u_int32_t pc_chownrestricted; u_int32_t pc_caseinsensitive; u_int32_t pc_casepreserving; - bool pc_has_namedattr; }; /*