summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2023-09-18 09:59:01 -0400
committerChuck Lever <chuck.lever@oracle.com>2023-10-16 12:44:17 -0400
commit74361e2b5d252ffda6d366548167ec1e8be4358f (patch)
tree218fe624a9ee33c7f144afdad9041f5e2deab7b1
parentb0c3a5f8c8caf05196560a7edbc69e10f3497817 (diff)
downloadlinux-stable-74361e2b5d252ffda6d366548167ec1e8be4358f.tar.gz
linux-stable-74361e2b5d252ffda6d366548167ec1e8be4358f.tar.bz2
linux-stable-74361e2b5d252ffda6d366548167ec1e8be4358f.zip
NFSD: Add nfsd4_encode_fattr4_files_free()
Refactor the encoder for FATTR4_FILES_FREE 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 5d57eca405e6..6e21f0444f4e 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -3149,6 +3149,12 @@ static __be32 nfsd4_encode_fattr4_files_avail(struct xdr_stream *xdr,
return nfsd4_encode_uint64_t(xdr, args->statfs.f_ffree);
}
+static __be32 nfsd4_encode_fattr4_files_free(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.
@@ -3383,10 +3389,9 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
goto out;
}
if (bmval0 & FATTR4_WORD0_FILES_FREE) {
- 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_free(xdr, &args);
+ if (status != nfs_ok)
+ goto out;
}
if (bmval0 & FATTR4_WORD0_FILES_TOTAL) {
p = xdr_reserve_space(xdr, 8);