[PATCH v3 30/38] nfsd: add helper to marshal a fattr4 from completed args

[Jeff Layton]

Break the loop that encodes the actual attr_vals field into a separate
function.

Signed-off-by: Jeff Layton <jlay...@kernel.org>
---
 fs/nfsd/nfs4xdr.c | 46 ++++++++++++++++++++++++++--------------------
 1 file changed, 26 insertions(+), 20 deletions(-)

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 
4a40d5e07fa3343a9b645c3b267897a31491e8e9..9a463f9c8a67704d90d1551b7de59e4e89a2a81d
 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -3565,6 +3565,22 @@ static const nfsd4_enc_attr 
nfsd4_enc_fattr4_encode_ops[] = {
        [FATTR4_OPEN_ARGUMENTS]         = nfsd4_encode_fattr4_open_arguments,
 };
 
+static __be32
+nfsd4_encode_attr_vals(struct xdr_stream *xdr, u32 *attrmask, struct 
nfsd4_fattr_args *args)
+{
+       DECLARE_BITMAP(attr_bitmap, ARRAY_SIZE(nfsd4_enc_fattr4_encode_ops));
+       unsigned long bit;
+       __be32 status;
+
+       bitmap_from_arr32(attr_bitmap, attrmask, 
ARRAY_SIZE(nfsd4_enc_fattr4_encode_ops));
+       for_each_set_bit(bit, attr_bitmap, 
ARRAY_SIZE(nfsd4_enc_fattr4_encode_ops)) {
+               status = nfsd4_enc_fattr4_encode_ops[bit](xdr, args);
+               if (status != nfs_ok)
+                       return status;
+       }
+       return nfs_ok;
+}
+
 /*
  * Note: @fhp can be NULL; in this case, we might have to compose the 
filehandle
  * ourselves.
@@ -3575,7 +3591,6 @@ nfsd4_encode_fattr4(struct svc_rqst *rqstp, struct 
xdr_stream *xdr,
                    struct dentry *dentry, const u32 *bmval,
                    int ignore_crossmnt)
 {
-       DECLARE_BITMAP(attr_bitmap, ARRAY_SIZE(nfsd4_enc_fattr4_encode_ops));
        struct nfs4_delegation *dp = NULL;
        struct nfsd4_fattr_args args;
        struct svc_fh *tempfh = NULL;
@@ -3590,7 +3605,6 @@ nfsd4_encode_fattr4(struct svc_rqst *rqstp, struct 
xdr_stream *xdr,
                .mnt    = exp->ex_path.mnt,
                .dentry = dentry,
        };
-       unsigned long bit;
 
        WARN_ON_ONCE(bmval[1] & NFSD_WRITEONLY_ATTRS_WORD1);
        WARN_ON_ONCE(!nfsd_attrs_supported(minorversion, bmval));
@@ -3710,27 +3724,22 @@ nfsd4_encode_fattr4(struct svc_rqst *rqstp, struct 
xdr_stream *xdr,
 #endif /* CONFIG_NFSD_V4_SECURITY_LABEL */
 
        /* attrmask */
-       status = nfsd4_encode_bitmap4(xdr, attrmask[0], attrmask[1],
-                                     attrmask[2]);
+       status = nfsd4_encode_bitmap4(xdr, attrmask[0], attrmask[1], 
attrmask[2]);
        if (status)
-               goto out;
+               return status;
 
        /* attr_vals */
        attrlen_offset = xdr->buf->len;
-       if (unlikely(!xdr_reserve_space(xdr, XDR_UNIT)))
-               goto out_resource;
-       bitmap_from_arr32(attr_bitmap, attrmask,
-                         ARRAY_SIZE(nfsd4_enc_fattr4_encode_ops));
-       for_each_set_bit(bit, attr_bitmap,
-                        ARRAY_SIZE(nfsd4_enc_fattr4_encode_ops)) {
-               status = nfsd4_enc_fattr4_encode_ops[bit](xdr, &args);
-               if (status != nfs_ok)
-                       goto out;
+       if (unlikely(!xdr_reserve_space(xdr, XDR_UNIT))) {
+               status = nfserr_resource;
+               goto out;
        }
-       attrlen = cpu_to_be32(xdr->buf->len - attrlen_offset - XDR_UNIT);
-       write_bytes_to_xdr_buf(xdr->buf, attrlen_offset, &attrlen, XDR_UNIT);
-       status = nfs_ok;
 
+       status = nfsd4_encode_attr_vals(xdr, attrmask, &args);
+       if (status == nfs_ok) {
+               attrlen = cpu_to_be32(xdr->buf->len - attrlen_offset - 
XDR_UNIT);
+               write_bytes_to_xdr_buf(xdr->buf, attrlen_offset, &attrlen, 
XDR_UNIT);
+       }
 out:
 #ifdef CONFIG_NFSD_V4_SECURITY_LABEL
        if (args.context.context)
@@ -3747,9 +3756,6 @@ nfsd4_encode_fattr4(struct svc_rqst *rqstp, struct 
xdr_stream *xdr,
 out_nfserr:
        status = nfserrno(err);
        goto out;
-out_resource:
-       status = nfserr_resource;
-       goto out;
 }
 
 static bool

-- 
2.51.0