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>

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 2f19f72c440706667aa7d1cbe6d17f4f867b20b5..5d57eca405e61c31340d20632199c13b7335ed28 100644 (file)
--- 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);