NFS: Clean up nfs4_proc_bind_one_conn_to_session()

Returning errors directly even lets us remove the goto

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

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 201ca3f2c4bac14986220fcdf6a6c37b734ffa96..184d57a5098d920eb11ef0a19c63e85fd9eeeaf1 100644 (file)
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -7155,8 +7155,6 @@ int nfs4_proc_bind_one_conn_to_session(struct rpc_clnt *clnt,
        };
        struct rpc_task *task;
 
-       dprintk("--> %s\n", __func__);
-
        nfs4_copy_sessionid(&args.sessionid, &clp->cl_session->sess_id);
        if (!(clp->cl_session->flags & SESSION4_BACK_CHAN))
                args.dir = NFS4_CDFC4_FORE;
@@ -7176,24 +7174,20 @@ int nfs4_proc_bind_one_conn_to_session(struct rpc_clnt *clnt,
                if (memcmp(res.sessionid.data,
                    clp->cl_session->sess_id.data, NFS4_MAX_SESSIONID_LEN)) {
                        dprintk("NFS: %s: Session ID mismatch\n", __func__);
-                       status = -EIO;
-                       goto out;
+                       return -EIO;
                }
                if ((res.dir & args.dir) != res.dir || res.dir == 0) {
                        dprintk("NFS: %s: Unexpected direction from server\n",
                                __func__);
-                       status = -EIO;
-                       goto out;
+                       return -EIO;
                }
                if (res.use_conn_in_rdma_mode != args.use_conn_in_rdma_mode) {
                        dprintk("NFS: %s: Server returned RDMA mode = true\n",
                                __func__);
-                       status = -EIO;
-                       goto out;
+                       return -EIO;
                }
        }
-out:
-       dprintk("<-- %s status= %d\n", __func__, status);
+
        return status;
 }