NFSD: Clean up nfsd4_encode_setattr()

De-duplicate the encoding of bitmap4 results in
nfsd4_encode_setattr().

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 55a6d1b9da770b500e08ff625595fd0062b8662a..df2383fbd0e710c97b7df0e4ffc6b1ad52ca0f28 100644 (file)
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -4433,34 +4433,25 @@ nfsd4_encode_secinfo_no_name(struct nfsd4_compoundres *resp, __be32 nfserr,
        return nfsd4_do_encode_secinfo(xdr, secinfo->sin_exp);
 }
 
-/*
- * The SETATTR encode routine is special -- it always encodes a bitmap,
- * regardless of the error status.
- */
 static __be32
 nfsd4_encode_setattr(struct nfsd4_compoundres *resp, __be32 nfserr,
                     union nfsd4_op_u *u)
 {
        struct nfsd4_setattr *setattr = &u->setattr;
-       struct xdr_stream *xdr = resp->xdr;
-       __be32 *p;
+       __be32 status;
 
-       p = xdr_reserve_space(xdr, 16);
-       if (!p)
-               return nfserr_resource;
-       if (nfserr) {
-               *p++ = cpu_to_be32(3);
-               *p++ = cpu_to_be32(0);
-               *p++ = cpu_to_be32(0);
-               *p++ = cpu_to_be32(0);
-       }
-       else {
-               *p++ = cpu_to_be32(3);
-               *p++ = cpu_to_be32(setattr->sa_bmval[0]);
-               *p++ = cpu_to_be32(setattr->sa_bmval[1]);
-               *p++ = cpu_to_be32(setattr->sa_bmval[2]);
+       switch (nfserr) {
+       case nfs_ok:
+               /* attrsset */
+               status = nfsd4_encode_bitmap4(resp->xdr, setattr->sa_bmval[0],
+                                             setattr->sa_bmval[1],
+                                             setattr->sa_bmval[2]);
+               break;
+       default:
+               /* attrsset */
+               status = nfsd4_encode_bitmap4(resp->xdr, 0, 0, 0);
        }
-       return nfserr;
+       return status != nfs_ok ? status : nfserr;
 }
 
 static __be32