NFSD: Add nfsd4_encode_fattr4_numlinks()
authorChuck Lever <chuck.lever@oracle.com>
Mon, 18 Sep 2023 13:59:59 +0000 (09:59 -0400)
committerChuck Lever <chuck.lever@oracle.com>
Mon, 16 Oct 2023 16:44:20 +0000 (12:44 -0400)
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>
fs/nfsd/nfs4xdr.c

index 105d51b517e5ee07c3c9e6484304b471c962f5c4..e1654b69506ea947d69bb297b3add1d42668cadf 100644 (file)
@@ -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);