nfsd4: individual encoders no longer see error cases

With a few exceptions, most individual encoders don't handle error
cases.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>

1 files changed, 103 insertions, 206 deletions

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 08badcf64554..18b9c2fad29a 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -3105,14 +3105,12 @@ nfsd4_encode_access(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_
         struct xdr_stream *xdr = &resp->xdr;
         __be32 *p;
 
-        if (!nfserr) {
-                p = xdr_reserve_space(xdr, 8);
-                if (!p)
-                        return nfserr_resource;
-                *p++ = cpu_to_be32(access->ac_supported);
-                *p++ = cpu_to_be32(access->ac_resp_access);
-        }
-        return nfserr;
+        p = xdr_reserve_space(xdr, 8);
+        if (!p)
+                return nfserr_resource;
+        *p++ = cpu_to_be32(access->ac_supported);
+        *p++ = cpu_to_be32(access->ac_resp_access);
+        return 0;
 }
 
 static __be32 nfsd4_encode_bind_conn_to_session(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_bind_conn_to_session *bcts)
@@ -3120,17 +3118,15 @@ static __be32 nfsd4_encode_bind_conn_to_session(struct nfsd4_compoundres *resp,
         struct xdr_stream *xdr = &resp->xdr;
         __be32 *p;
 
-        if (!nfserr) {
-                p = xdr_reserve_space(xdr, NFS4_MAX_SESSIONID_LEN + 8);
-                if (!p)
-                        return nfserr_resource;
-                p = xdr_encode_opaque_fixed(p, bcts->sessionid.data,
-                                                NFS4_MAX_SESSIONID_LEN);
-                *p++ = cpu_to_be32(bcts->dir);
-                /* Upshifting from TCP to RDMA is not supported */
-                *p++ = cpu_to_be32(0);
-        }
-        return nfserr;
+        p = xdr_reserve_space(xdr, NFS4_MAX_SESSIONID_LEN + 8);
+        if (!p)
+                return nfserr_resource;
+        p = xdr_encode_opaque_fixed(p, bcts->sessionid.data,
+                                        NFS4_MAX_SESSIONID_LEN);
+        *p++ = cpu_to_be32(bcts->dir);
+        /* Upshifting from TCP to RDMA is not supported */
+        *p++ = cpu_to_be32(0);
+        return 0;
 }
 
 static __be32
@@ -3138,10 +3134,7 @@ nfsd4_encode_close(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_c
 {
         struct xdr_stream *xdr = &resp->xdr;
 
-        if (!nfserr)
-                nfserr = nfsd4_encode_stateid(xdr, &close->cl_stateid);
-
-        return nfserr;
+        return nfsd4_encode_stateid(xdr, &close->cl_stateid);
 }
 
 
@@ -3151,14 +3144,12 @@ nfsd4_encode_commit(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_
         struct xdr_stream *xdr = &resp->xdr;
         __be32 *p;
 
-        if (!nfserr) {
-                p = xdr_reserve_space(xdr, NFS4_VERIFIER_SIZE);
-                if (!p)
-                        return nfserr_resource;
-                p = xdr_encode_opaque_fixed(p, commit->co_verf.data,
+        p = xdr_reserve_space(xdr, NFS4_VERIFIER_SIZE);
+        if (!p)
+                return nfserr_resource;
+        p = xdr_encode_opaque_fixed(p, commit->co_verf.data,
                                                 NFS4_VERIFIER_SIZE);
-        }
-        return nfserr;
+        return 0;
 }
 
 static __be32
@@ -3167,15 +3158,13 @@ nfsd4_encode_create(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_
         struct xdr_stream *xdr = &resp->xdr;
         __be32 *p;
 
-        if (!nfserr) {
-                p = xdr_reserve_space(xdr, 20);
-                if (!p)
-                        return nfserr_resource;
-                encode_cinfo(p, &create->cr_cinfo);
-                nfserr = nfsd4_encode_bitmap(xdr, create->cr_bmval[0],
-                                create->cr_bmval[1], create->cr_bmval[2]);
-        }
-        return nfserr;
+        p = xdr_reserve_space(xdr, 20);
+        if (!p)
+                return nfserr_resource;
+        encode_cinfo(p, &create->cr_cinfo);
+        nfserr = nfsd4_encode_bitmap(xdr, create->cr_bmval[0],
+                        create->cr_bmval[1], create->cr_bmval[2]);
+        return 0;
 }
 
 static __be32
@@ -3184,13 +3173,8 @@ nfsd4_encode_getattr(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4
         struct svc_fh *fhp = getattr->ga_fhp;
         struct xdr_stream *xdr = &resp->xdr;
 
-        if (nfserr)
-                return nfserr;
-
-        nfserr = nfsd4_encode_fattr(xdr, fhp, fhp->fh_export, fhp->fh_dentry,
-                                    getattr->ga_bmval,
-                                    resp->rqstp, 0);
-        return nfserr;
+        return nfsd4_encode_fattr(xdr, fhp, fhp->fh_export, fhp->fh_dentry,
+                                    getattr->ga_bmval, resp->rqstp, 0);
 }
 
 static __be32
@@ -3201,14 +3185,12 @@ nfsd4_encode_getfh(struct nfsd4_compoundres *resp, __be32 nfserr, struct svc_fh
         unsigned int len;
         __be32 *p;
 
-        if (!nfserr) {
-                len = fhp->fh_handle.fh_size;
-                p = xdr_reserve_space(xdr, len + 4);
-                if (!p)
-                        return nfserr_resource;
-                p = xdr_encode_opaque(p, &fhp->fh_handle.fh_base, len);
-        }
-        return nfserr;
+        len = fhp->fh_handle.fh_size;
+        p = xdr_reserve_space(xdr, len + 4);
+        if (!p)
+                return nfserr_resource;
+        p = xdr_encode_opaque(p, &fhp->fh_handle.fh_base, len);
+        return 0;
 }
 
 /*
@@ -3278,10 +3260,7 @@ nfsd4_encode_locku(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_l
 {
         struct xdr_stream *xdr = &resp->xdr;
 
-        if (!nfserr)
-                nfserr = nfsd4_encode_stateid(xdr, &locku->lu_stateid);
-
-        return nfserr;
+        return nfsd4_encode_stateid(xdr, &locku->lu_stateid);
 }
 
 
@@ -3291,13 +3270,11 @@ nfsd4_encode_link(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_li
         struct xdr_stream *xdr = &resp->xdr;
         __be32 *p;
 
-        if (!nfserr) {
-                p = xdr_reserve_space(xdr, 20);
-                if (!p)
-                        return nfserr_resource;
-                p = encode_cinfo(p, &link->li_cinfo);
-        }
-        return nfserr;
+        p = xdr_reserve_space(xdr, 20);
+        if (!p)
+                return nfserr_resource;
+        p = encode_cinfo(p, &link->li_cinfo);
+        return 0;
 }
 
 
@@ -3307,12 +3284,9 @@ nfsd4_encode_open(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_op
         struct xdr_stream *xdr = &resp->xdr;
         __be32 *p;
 
-        if (nfserr)
-                goto out;
-
         nfserr = nfsd4_encode_stateid(xdr, &open->op_stateid);
         if (nfserr)
-                goto out;
+                return nfserr;
         p = xdr_reserve_space(xdr, 24);
         if (!p)
                 return nfserr_resource;
@@ -3322,7 +3296,7 @@ nfsd4_encode_open(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_op
         nfserr = nfsd4_encode_bitmap(xdr, open->op_bmval[0], open->op_bmval[1],
                                         open->op_bmval[2]);
         if (nfserr)
-                goto out;
+                return nfserr;
 
         p = xdr_reserve_space(xdr, 4);
         if (!p)
@@ -3395,8 +3369,7 @@ nfsd4_encode_open(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_op
                 BUG();
         }
         /* XXX save filehandle here */
-out:
-        return nfserr;
+        return 0;