From nobody Thu Jun 18 00:37:08 2026 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 4gghd045CWz6j4gf for ; Thu, 18 Jun 2026 00:37:08 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gghd03XFGz3GV7 for ; Thu, 18 Jun 2026 00:37:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781743028; 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=/arRObskPm7gp5z8ZJ8lDQiNe6va6/BWM9xOPdoKNjM=; b=ww3hg6r+uJgO2S3E/96vQGtWAaJJnfEbQBFUa6IsA/c8HlXbP/TF7Y9rXzoqBQuI+ABgBx g/LT8p78ii0VXsXBvaoe/Jmpxkx5CFfFFaaA72Tw+W4fOLAGexJM8O/HBuFAK4HIyQtyYr XUYFHBESOfBVt5Cn/Yyhord4jIhwN2Y95nZHjcyrhUXX2kGHJe41KT9ezR0I24/bitVohm /q09L7xemdfcsn0WKO8y53oR8PGhllq9RpzX1D0KNhbCKdh0HDs3DRIZfTQZ7idLQ9Kzxh DyHjjGcPF/n1nMW/XHrhOxpBZ9yh3O/hE9s+H32a/xbu4J9i9VT5GmOERcVzIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781743028; a=rsa-sha256; cv=none; b=DWhMuA6TTd3cTd7Lju8zP+/Vhd9+bFfVo/MIXJ2V2vPDqmPmRJ/baa5NEV9qz0mOrgbI+v qoGJFr9RTuBLnjxF82iJ+MXw2jpia/vE+UGQEHhKhlhkR11n0/Lz7ODOqzw9VJ9Y6lQI2n pzl/bwPopGwBAO1w2lOH3Nk+aKkodVdS9/VZjzEOEPSupJb9F55fKYTXKuobNtzKlY87nq K8SZTR1GANg8vrIIOmYemLE8TGiATjVrRWL8sjOPxQvUQKcux+IYroz9x2pLtEOB2/AFkn uc4SOzqbljEH4yOVIAZMIUdNDR6vfcSISmCTIvCztBFZVzbfc81+/wabt0u6Jw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781743028; 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=/arRObskPm7gp5z8ZJ8lDQiNe6va6/BWM9xOPdoKNjM=; b=cjVLboLH4b7ye+hRQ9cF9VU78J9Atpjrri+vUWuVZDNKbdt0DvwOnd8dO8VldrbzfIRGR0 wFBgB9S0a3pP66Bi3gydDqMlR9t6+eQjyNA9UOZC9vbJDp/Mjns8DJzHAF5MRdgZzTIlvu AiY7GZpUQi94yw8eH6cO5agoyYpYj5pd49VvAGL1PdZ4Wl40o37Sq6HCptjtMb5+Fu/NkP kCBdYVjSEWRqc9Yw83PVjGyCYsHLrknqCkmrNefLGWY1wzFmsSy07wS5cZizx7KeoQujpC 3atEzdmutQG7WmsKYOyHgXfJ7tlCIm/DRRCi1aYUe61VlwGARquLRsZVWlkI6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gghd027C4zcST for ; Thu, 18 Jun 2026 00:37:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22974 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 18 Jun 2026 00:37:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 572680712c31 - main - nfs_clvnops.c: Fix the case where va_flags are being cleared 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 572680712c317b81d66475203ac1b9d6bbeca5d5 Auto-Submitted: auto-generated Date: Thu, 18 Jun 2026 00:37:08 +0000 Message-Id: <6a333db4.22974.31da2a9@gitrepo.freebsd.org> The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=572680712c317b81d66475203ac1b9d6bbeca5d5 commit 572680712c317b81d66475203ac1b9d6bbeca5d5 Author: Rick Macklem AuthorDate: 2026-06-18 00:30:29 +0000 Commit: Rick Macklem CommitDate: 2026-06-18 00:34:57 +0000 nfs_clvnops.c: Fix the case where va_flags are being cleared Commits c5d72d2 and 3b6d4c6 broke the case where the archive/hidden/system attributes are being set false (UF_ARCHIVE, UF_HIDDEN or UF_SYSTEM bits being cleared.) and the NFS server does not support those attributes. These patches only checked for support if the archive/hidden/system attributes were non-zero. This patch fixes the problem. PR: 296088 Tested by: Joshua Kinard MFC after: 1 week Fixes: c5d72d29fe0e ("nfsv4: Add support for the NFSv4 hidden and system attributes") --- sys/fs/nfsclient/nfs_clvnops.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index 26aa6491ac4a..5081e442882e 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -1033,12 +1033,9 @@ nfs_setattr(struct vop_setattr_args *ap) nmp = VFSTONFS(vp->v_mount); if (vap->va_flags != VNOVAL && (!NFSHASNFSV4(nmp) || (vap->va_flags & ~(UF_ARCHIVE | UF_HIDDEN | UF_SYSTEM)) != 0 || - ((vap->va_flags & UF_ARCHIVE) != 0 && - !NFSISSET_ATTRBIT(&np->n_vattr.na_suppattr, NFSATTRBIT_ARCHIVE)) || - ((vap->va_flags & UF_HIDDEN) != 0 && - !NFSISSET_ATTRBIT(&np->n_vattr.na_suppattr, NFSATTRBIT_HIDDEN)) || - ((vap->va_flags & UF_SYSTEM) != 0 && - !NFSISSET_ATTRBIT(&np->n_vattr.na_suppattr, NFSATTRBIT_SYSTEM)))) + !NFSISSET_ATTRBIT(&np->n_vattr.na_suppattr, NFSATTRBIT_ARCHIVE) || + !NFSISSET_ATTRBIT(&np->n_vattr.na_suppattr, NFSATTRBIT_HIDDEN) || + !NFSISSET_ATTRBIT(&np->n_vattr.na_suppattr, NFSATTRBIT_SYSTEM))) return (EOPNOTSUPP); /*