aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChuck Lever <[email protected]>2023-09-18 09:57:26 -0400
committerChuck Lever <[email protected]>2023-10-16 12:44:12 -0400
commit8c4422881f73d77a259352e0e93b7bdaf172768a (patch)
treef59d94e41d0ab5fcdc1c05d4456faa5ac9fb3d01
parentc88cb4727a77220ba2bc8f09aa01ec2aeb0be033 (diff)
NFSD: Add nfsd4_encode_fattr4__false()
Add an encoding helper that encodes a single boolean "false" value. Attributes that always return "false" can use this helper. In a subsequent patch, this helper will be called from a bitmask loop, so it is given a standardized synopsis. Reviewed-by: Jeff Layton <[email protected]> Signed-off-by: Chuck Lever <[email protected]>
-rw-r--r--fs/nfsd/nfs4xdr.c27
1 files changed, 15 insertions, 12 deletions
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 4b0e2966aa12..3160628ae0e4 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -2954,6 +2954,12 @@ static __be32 nfsd4_encode_fattr4__true(struct xdr_stream *xdr,
return nfsd4_encode_bool(xdr, true);
}
+static __be32 nfsd4_encode_fattr4__false(struct xdr_stream *xdr,
+ const struct nfsd4_fattr_args *args)
+{
+ return nfsd4_encode_bool(xdr, false);
+}
+
/*
* Note: @fhp can be NULL; in this case, we might have to compose the filehandle
* ourselves.
@@ -3150,10 +3156,9 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
goto out;
}
if (bmval0 & FATTR4_WORD0_NAMED_ATTR) {
- p = xdr_reserve_space(xdr, 4);
- if (!p)
- goto out_resource;
- *p++ = cpu_to_be32(0);
+ status = nfsd4_encode_fattr4__false(xdr, &args);
+ if (status != nfs_ok)
+ goto out;
}
if (bmval0 & FATTR4_WORD0_FSID) {
p = xdr_reserve_space(xdr, 16);
@@ -3180,10 +3185,9 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
}
}
if (bmval0 & FATTR4_WORD0_UNIQUE_HANDLES) {
- p = xdr_reserve_space(xdr, 4);
- if (!p)
- goto out_resource;
- *p++ = cpu_to_be32(0);
+ status = nfsd4_encode_fattr4__false(xdr, &args);
+ if (status != nfs_ok)
+ goto out;
}
if (bmval0 & FATTR4_WORD0_LEASE_TIME) {
p = xdr_reserve_space(xdr, 4);
@@ -3240,10 +3244,9 @@ out_acl:
goto out;
}
if (bmval0 & FATTR4_WORD0_CASE_INSENSITIVE) {
- p = xdr_reserve_space(xdr, 4);
- if (!p)
- goto out_resource;
- *p++ = cpu_to_be32(0);
+ status = nfsd4_encode_fattr4__false(xdr, &args);
+ if (status != nfs_ok)
+ goto out;
}
if (bmval0 & FATTR4_WORD0_CASE_PRESERVING) {
status = nfsd4_encode_fattr4__true(xdr, &args);