NFS: Clean up decode_cb_sequence_args()

Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>

diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
index d5ddceb91a9a186619ce0435015ca936aa93d6c1..ce1e293b8a1840cd6e02daf118895046af7e74cb 100644 (file)
--- a/fs/nfs/callback_xdr.c
+++ b/fs/nfs/callback_xdr.c
@@ -413,12 +413,11 @@ static __be32 decode_cb_sequence_args(struct svc_rqst *rqstp,
 
        status = decode_sessionid(xdr, &args->csa_sessionid);
        if (status)
-               goto out;
+               return status;
 
-       status = htonl(NFS4ERR_RESOURCE);
        p = read_buf(xdr, 5 * sizeof(uint32_t));
        if (unlikely(p == NULL))
-               goto out;
+               return htonl(NFS4ERR_RESOURCE);
 
        args->csa_addr = svc_addr(rqstp);
        args->csa_sequenceid = ntohl(*p++);
@@ -432,7 +431,7 @@ static __be32 decode_cb_sequence_args(struct svc_rqst *rqstp,
                                                  sizeof(*args->csa_rclists),
                                                  GFP_KERNEL);
                if (unlikely(args->csa_rclists == NULL))
-                       goto out;
+                       return htonl(NFS4ERR_RESOURCE);
 
                for (i = 0; i < args->csa_nrclists; i++) {
                        status = decode_rc_list(xdr, &args->csa_rclists[i]);
@@ -442,27 +441,13 @@ static __be32 decode_cb_sequence_args(struct svc_rqst *rqstp,
                        }
                }
        }
-       status = 0;
-
-       dprintk("%s: sessionid %x:%x:%x:%x sequenceid %u slotid %u "
-               "highestslotid %u cachethis %d nrclists %u\n",
-               __func__,
-               ((u32 *)&args->csa_sessionid)[0],
-               ((u32 *)&args->csa_sessionid)[1],
-               ((u32 *)&args->csa_sessionid)[2],
-               ((u32 *)&args->csa_sessionid)[3],
-               args->csa_sequenceid, args->csa_slotid,
-               args->csa_highestslotid, args->csa_cachethis,
-               args->csa_nrclists);
-out:
-       dprintk("%s: exit with status = %d\n", __func__, ntohl(status));
-       return status;
+       return 0;
 
 out_free:
        for (i = 0; i < args->csa_nrclists; i++)
                kfree(args->csa_rclists[i].rcl_refcalls);
        kfree(args->csa_rclists);
-       goto out;
+       return status;
 }
 
 static __be32 decode_recallany_args(struct svc_rqst *rqstp,