NFSD: Add nfsd4_encode_fattr4_mode()

Refactor the encoder for FATTR4_MODE 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 c9ff1091711cf53fcb583f263860509af2c7ce20..105d51b517e5ee07c3c9e6484304b471c962f5c4 100644 (file)
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -3183,6 +3183,12 @@ static __be32 nfsd4_encode_fattr4_maxwrite(struct xdr_stream *xdr,
        return nfsd4_encode_uint64_t(xdr, svc_max_payload(args->rqstp));
 }
 
+static __be32 nfsd4_encode_fattr4_mode(struct xdr_stream *xdr,
+                                      const struct nfsd4_fattr_args *args)
+{
+       return nfsd4_encode_mode4(xdr, args->stat.mode & S_IALLUGO);
+}
+
 /*
  * Note: @fhp can be NULL; in this case, we might have to compose the filehandle
  * ourselves.
@@ -3462,10 +3468,9 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
                        goto out;
        }
        if (bmval1 & FATTR4_WORD1_MODE) {
-               p = xdr_reserve_space(xdr, 4);
-               if (!p)
-                       goto out_resource;
-               *p++ = cpu_to_be32(args.stat.mode & S_IALLUGO);
+               status = nfsd4_encode_fattr4_mode(xdr, &args);
+               if (status != nfs_ok)
+                       goto out;
        }
        if (bmval1 & FATTR4_WORD1_NO_TRUNC) {
                status = nfsd4_encode_fattr4__true(xdr, &args);

diff --git a/fs/nfsd/xdr4.h b/fs/nfsd/xdr4.h
index f0866a55fd91412fc7290a1f1ce4bea3ec53a4aa..52322acc1e9f9b3a55e160d1d31da4b55b933f2f 100644 (file)
--- a/fs/nfsd/xdr4.h
+++ b/fs/nfsd/xdr4.h
@@ -93,6 +93,7 @@ nfsd4_encode_uint32_t(struct xdr_stream *xdr, u32 val)
 #define nfsd4_encode_aceflag4(x, v)    nfsd4_encode_uint32_t(x, v)
 #define nfsd4_encode_acemask4(x, v)    nfsd4_encode_uint32_t(x, v)
 #define nfsd4_encode_acetype4(x, v)    nfsd4_encode_uint32_t(x, v)
+#define nfsd4_encode_mode4(x, v)       nfsd4_encode_uint32_t(x, v)
 #define nfsd4_encode_nfs_lease4(x, v)  nfsd4_encode_uint32_t(x, v)
 
 /**