NFSD: Add nfsd4_encode_fattr4_size()
authorChuck Lever <chuck.lever@oracle.com>
Mon, 18 Sep 2023 13:57:58 +0000 (09:57 -0400)
committerChuck Lever <chuck.lever@oracle.com>
Mon, 16 Oct 2023 16:44:14 +0000 (12:44 -0400)
Refactor the encoder for FATTR4_SIZE 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>
fs/nfsd/nfs4xdr.c

index c557d8ac0d386658644759334b166b5245629c15..d08e0dbe3dd4ed0073e45b0a4f6d76a7f8a6ccf5 100644 (file)
@@ -3025,6 +3025,12 @@ static __be32 nfsd4_encode_fattr4_change(struct xdr_stream *xdr,
        return nfsd4_encode_changeid4(xdr, c);
 }
 
+static __be32 nfsd4_encode_fattr4_size(struct xdr_stream *xdr,
+                                      const struct nfsd4_fattr_args *args)
+{
+       return nfsd4_encode_uint64_t(xdr, args->size);
+}
+
 /*
  * Note: @fhp can be NULL; in this case, we might have to compose the filehandle
  * ourselves.
@@ -3175,10 +3181,9 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
                        goto out;
        }
        if (bmval0 & FATTR4_WORD0_SIZE) {
-               p = xdr_reserve_space(xdr, 8);
-               if (!p)
-                       goto out_resource;
-               p = xdr_encode_hyper(p, args.size);
+               status = nfsd4_encode_fattr4_size(xdr, &args);
+               if (status != nfs_ok)
+                       goto out;
        }
        if (bmval0 & FATTR4_WORD0_LINK_SUPPORT) {
                status = nfsd4_encode_fattr4__true(xdr, &args);