summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2023-09-18 09:58:55 -0400
committerChuck Lever <chuck.lever@oracle.com>2023-10-16 12:44:17 -0400
commitb0c3a5f8c8caf05196560a7edbc69e10f3497817 (patch)
treeb48d500d2be9294ee4a14ba5ec253456e4f19d02
parenteb7ece81d5fcd3d2bc54a33040967f24e7c5b317 (diff)
downloadlinux-stable-b0c3a5f8c8caf05196560a7edbc69e10f3497817.tar.gz
linux-stable-b0c3a5f8c8caf05196560a7edbc69e10f3497817.tar.bz2
linux-stable-b0c3a5f8c8caf05196560a7edbc69e10f3497817.zip
NFSD: Add nfsd4_encode_fattr4_files_avail()
Refactor the encoder for FATTR4_FILES_AVAIL 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>
-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 2f19f72c4407..5d57eca405e6 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -3143,6 +3143,12 @@ static __be32 nfsd4_encode_fattr4_fileid(struct xdr_stream *xdr,
return nfsd4_encode_uint64_t(xdr, args->stat.ino);
}
+static __be32 nfsd4_encode_fattr4_files_avail(struct xdr_stream *xdr,
+ const struct nfsd4_fattr_args *args)
+{
+ return nfsd4_encode_uint64_t(xdr, args->statfs.f_ffree);
+}
+
/*
* Note: @fhp can be NULL; in this case, we might have to compose the filehandle
* ourselves.
@@ -3372,10 +3378,9 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
goto out;
}
if (bmval0 & FATTR4_WORD0_FILES_AVAIL) {
- p = xdr_reserve_space(xdr, 8);
- if (!p)
- goto out_resource;
- p = xdr_encode_hyper(p, (u64) args.statfs.f_ffree);
+ status = nfsd4_encode_fattr4_files_avail(xdr, &args);
+ if (status != nfs_ok)
+ goto out;
}
if (bmval0 & FATTR4_WORD0_FILES_FREE) {
p = xdr_reserve_space(xdr, 8);