From nobody Thu Jun 25 00:49:54 2026 X-Original-To: dev-commits-src-branches@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 4gm0ZV6l3xz6k5Gs for ; Thu, 25 Jun 2026 00:49:54 +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 4gm0ZV6FWnz3ZVV for ; Thu, 25 Jun 2026 00:49:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782348594; 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=kX9lCt9+aEBNGWFwippqvVSLlcaKQtjzXSuq1PGKJvQ=; b=b/4f9CzeyoGfuTfNfqapM3Kfu2EELIBGsr85p/43zjxK5M0MGcmjoGyC3IVvdqKEXuJYsY gAtlu1QwCn8gkaAA5OPeXRRQMr/4bQamwqcPJmKqXPN6FZPyGJvmTR8iBkfPlBihXNub1X 8V1kiyJ6rQofjSxBh5UaGWEQBWgCJPR74i+1rpSzLxymjnTeBX6YPp70mGRhsCPrXZtFeX ixFsWwE8eCb5ad6WC1veIZoCvYZosFoN4tgsAzHcQNQS6RZDXJMNjz6kFKrmUTkwrmRlvr 2y1k0yZ03atbW+cFi+EfHVj3KEGvo1L0FFGS91GMCcr6ujgbS+AOsj82RO6Y9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782348594; a=rsa-sha256; cv=none; b=kldYh2QPHN6jtbkF26pd7Ao8WStp3pbBxdfMlZ2H7nT7YsAFBl4ZiFF1NJKAZEzxqerzxz nzimGhBUkXvgOcg3VbOV1B7Tndxfur332rOLodFPEPtQGy7ESOb92rThTfMh8NXMgUbygO 0RrhhZpRdvIM10Ut1GisY5wsEyKrWJRtOMWf4nal8V5PNBiqNv68ojv8Kds+KcXjtff8CT lb2is6m6r8smaqwSkq+GaeP4c+ihkm3euf3aDl6SxY7FHyUtQsEQTT1gKORRVpfbU6j7Eb dTDAwPFsaq2hUYK8ow6+Dq0KpFcLkAJv/O9xPjxWGgJ0vnymBpLPzHTvk9s1Xg== 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=1782348594; 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=kX9lCt9+aEBNGWFwippqvVSLlcaKQtjzXSuq1PGKJvQ=; b=aD6ZH6xh1cCVVRGmWvvuc3hs3Fvi7kQs5wGamCcBzBIwfevAG7WQhWxkGP0PijK9jm+iuT ILqbyYIu62v+6LlXQWgSvpHz9ddSFkGoq4cQKyBBTbHEExo9CcAy4Yol+HimoWafob70s0 D5S855SBAVCNTDkJfEAy8QNFEgI32b1k41tpPPees2Gwz0/l5L+6ZBJ/cYnod2T4pdU4J4 80Whw8S2fHVTlOjJMsjrJ08Hf/lb52Rh2zEIw9yxLL07oinpU0bh5kap60acfeQsunWfDe njfq4dhqC37zTgKbLkfQdSiUurCbkEcoGv3BVqY+KIAVQapm0SII6nxaAetFVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gm0ZV5JBbzkL4 for ; Thu, 25 Jun 2026 00:49:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d288 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 25 Jun 2026 00:49:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 3a3d12112483 - stable/15 - nfs_clvnops.c: Fix the case where va_flags are being cleared List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: 3a3d12112483d22624971ca97c8b975329416122 Auto-Submitted: auto-generated Date: Thu, 25 Jun 2026 00:49:54 +0000 Message-Id: <6a3c7b32.3d288.479e8330@gitrepo.freebsd.org> The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=3a3d12112483d22624971ca97c8b975329416122 commit 3a3d12112483d22624971ca97c8b975329416122 Author: Rick Macklem AuthorDate: 2026-06-18 00:30:29 +0000 Commit: Rick Macklem CommitDate: 2026-06-25 00:48:15 +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 (cherry picked from commit 572680712c317b81d66475203ac1b9d6bbeca5d5) --- 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 6b0531dda504..ecaa27a0f889 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); /*