The branch main has been updated by des:
URL:
https://cgit.FreeBSD.org/src/commit/?id=83e351780f634657b74405b8059a1683d01baf4a
commit 83e351780f634657b74405b8059a1683d01baf4a
Author: Dag-Erling Smørgrav <d...@freebsd.org>
AuthorDate: 2025-07-10 14:53:13 +0000
Commit: Dag-Erling Smørgrav <d...@freebsd.org>
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) {
