aboutsummaryrefslogtreecommitdiff
path: root/fs/nfsd
diff options
context:
space:
mode:
authorGravatar Chuck Lever <chuck.lever@oracle.com> 2023-09-18 09:59:59 -0400
committerGravatar Chuck Lever <chuck.lever@oracle.com> 2023-10-16 12:44:20 -0400
commit9f329fea25188def0a42bacd27894c877bb599c8 (patch)
tree15d537a087d969786135c06647feacd98d0a393f /fs/nfsd
parentNFSD: Add nfsd4_encode_fattr4_mode() (diff)
downloadlinux-9f329fea25188def0a42bacd27894c877bb599c8.tar.gz
linux-9f329fea25188def0a42bacd27894c877bb599c8.tar.bz2
linux-9f329fea25188def0a42bacd27894c877bb599c8.zip
NFSD: Add nfsd4_encode_fattr4_numlinks()
Refactor the encoder for FATTR4_NUMLINKS into a helper. In a subsequent patch, this helper will be called from a bitmask loop. Reviewed-by: Jeff Layton <jlayton@kernel.org> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Diffstat (limited to 'fs/nfsd')
-rw-r--r--fs/nfsd/nfs4xdr.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 105d51b517e5..e1654b69506e 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -3189,6 +3189,12 @@ static __be32 nfsd4_encode_fattr4_mode(struct xdr_stream *xdr,
return nfsd4_encode_mode4(xdr, args->stat.mode & S_IALLUGO);
}
+static __be32 nfsd4_encode_fattr4_numlinks(struct xdr_stream *xdr,
+ const struct nfsd4_fattr_args *args)
+{
+ return nfsd4_encode_uint32_t(xdr, args->stat.nlink);
+}
+
/*
* Note: @fhp can be NULL; in this case, we might have to compose the filehandle
* ourselves.
@@ -3478,10 +3484,9 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
goto out;
}
if (bmval1 & FATTR4_WORD1_NUMLINKS) {
- p = xdr_reserve_space(xdr, 4);
- if (!p)
- goto out_resource;
- *p++ = cpu_to_be32(args.stat.nlink);
+ status = nfsd4_encode_fattr4_numlinks(xdr, &args);
+ if (status != nfs_ok)
+ goto out;
}
if (bmval1 & FATTR4_WORD1_OWNER) {
status = nfsd4_encode_user(xdr, rqstp, args.stat.uid);