From nobody Thu Jul 10 14:54:45 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 4bdHts51mkz618W9; Thu, 10 Jul 2025 14:54:45 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bdHts4R6xz3Cj3; Thu, 10 Jul 2025 14:54:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752159285; 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=vXUkQsCGAg1vy9WKv9GCWQk7ul6NNd6eWms1YBMbB5I=; b=geWWKJQyr5DB4ir3fOwVcimMTlKK83BqirjzyInHudeYowg0o98/q1YAW0FkDNk/G893hf dRs7mNQILFylOlZ2ggvt/B2c0G6sFYiMTKl6pJrFF4SA+Un17cW7NlLaxSWWnSpykXla3U PAzWPfDTZDhu8ohCkn6fvAuNYz8U5qJg73cTAmb4kIDqFiXd731hQHhN/vP1UjaLrLXwqY 37DQwU1Oob/XfGkkZHhkxG4OTgofWqEYbkF9Sg1AAlOVzzCukuJ3sG5iEnTGhXHztY96kj WWFJgcmDoFQj0NeQYJFKTbxkMkSNip7QfjVwq/u8IMd2XgzP3tuDW02Ae5uW8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752159285; 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=vXUkQsCGAg1vy9WKv9GCWQk7ul6NNd6eWms1YBMbB5I=; b=l/4yjHJiTGMR5AlmFZwjYtJr6fRjpS5nyXa9pBhFtwzehDseep5ub5iK6uH0GPWro6lID8 kT/g5xlFJ6nHQRNORh4LSWvTCebe51EcU70LzpD7ROY72F6iTH0ev+BxaQPuXQ10P7DUF+ YgnEbAhA7xvxn4CzTxv+CK7mvRJ1Zp2vZsQ3yEQBLethVExEYp6VQLeVJSlGWXW3f9G1ws mtGSO5LSkzjp+N8t4yx5514yxbs62J3L/5eQNgO+k8aZFKmX0Ll4ZJC7Drix3h+NreIvwz 5wNES3nYiSOhkUrUERWhk9mFH8U9UbcI1lBxpRQqkkoefqlE3g307hCJaMPEqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752159285; a=rsa-sha256; cv=none; b=AqG7FkroziZoPozdyflmx/lAf3faBzxg1W0qJbZ5lJEmGFpJxsvkIBhsDC8VHV2yBrL8NU mdE5tnTdL8QrCL7mdRoJC63GCoEAnc3+j5m6lZN8spmuU4DyfNfg0ffLbaXopQqqkOAwOP b6uctTi6ANVE6+x+k2GasWZ6y7vA9L3WbYDwOXIyiYZR7gaxj+tCyaancM4a0akCo54Col REWGTZIY3hA5dT75cfOvCHLsredXF6I9W6b+DWG5i0aNnPZCdZptf6KaXI8G9ZIOm1u9y/ tr4B4Icu4J5skSXXK0omw1N2Op01QxSeU7OE9bOckgCsqFYykkICfr3qNBhsrw== 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 4bdHts3xTFz1BDV; Thu, 10 Jul 2025 14:54:45 +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 56AEsjDg034731; Thu, 10 Jul 2025 14:54:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56AEsjLT034728; Thu, 10 Jul 2025 14:54:45 GMT (envelope-from git) Date: Thu, 10 Jul 2025 14:54:45 GMT Message-Id: <202507101454.56AEsjLT034728@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 83e351780f63 - main - nfsv4: No need to check va_flags twice. 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 83e351780f634657b74405b8059a1683d01baf4a Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=83e351780f634657b74405b8059a1683d01baf4a commit 83e351780f634657b74405b8059a1683d01baf4a Author: Dag-Erling Smørgrav AuthorDate: 2025-07-10 14:53:13 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-07-10 14:54:41 +0000 nfsv4: No need to check va_flags twice. Fixes: c5d72d29fe0e Reviewed by: rmacklem --- sys/fs/nfsclient/nfs_clvnops.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index fbfcdafaa06b..fa451887e73e 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -1096,12 +1096,11 @@ nfs_setattr(struct vop_setattr_args *ap) /* * Disallow write attempts if the filesystem is mounted read-only. */ - if ((vap->va_flags != VNOVAL || vap->va_uid != (uid_t)VNOVAL || + if ((vap->va_flags != (u_long)VNOVAL || vap->va_uid != (uid_t)VNOVAL || vap->va_gid != (gid_t)VNOVAL || vap->va_atime.tv_sec != VNOVAL || vap->va_mtime.tv_sec != VNOVAL || vap->va_birthtime.tv_sec != VNOVAL || - vap->va_mode != (mode_t)VNOVAL || - vap->va_flags != (u_long)VNOVAL) && + vap->va_mode != (mode_t)VNOVAL) && (vp->v_mount->mnt_flag & MNT_RDONLY)) return (EROFS); if (vap->va_size != VNOVAL) {