|
@@ -7155,8 +7155,6 @@ int nfs4_proc_bind_one_conn_to_session(struct rpc_clnt *clnt,
|
|
};
|
|
};
|
|
struct rpc_task *task;
|
|
struct rpc_task *task;
|
|
|
|
|
|
- dprintk("--> %s\n", __func__);
|
|
|
|
-
|
|
|
|
nfs4_copy_sessionid(&args.sessionid, &clp->cl_session->sess_id);
|
|
nfs4_copy_sessionid(&args.sessionid, &clp->cl_session->sess_id);
|
|
if (!(clp->cl_session->flags & SESSION4_BACK_CHAN))
|
|
if (!(clp->cl_session->flags & SESSION4_BACK_CHAN))
|
|
args.dir = NFS4_CDFC4_FORE;
|
|
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,
|
|
if (memcmp(res.sessionid.data,
|
|
clp->cl_session->sess_id.data, NFS4_MAX_SESSIONID_LEN)) {
|
|
clp->cl_session->sess_id.data, NFS4_MAX_SESSIONID_LEN)) {
|
|
dprintk("NFS: %s: Session ID mismatch\n", __func__);
|
|
dprintk("NFS: %s: Session ID mismatch\n", __func__);
|
|
- status = -EIO;
|
|
|
|
- goto out;
|
|
|
|
|
|
+ return -EIO;
|
|
}
|
|
}
|
|
if ((res.dir & args.dir) != res.dir || res.dir == 0) {
|
|
if ((res.dir & args.dir) != res.dir || res.dir == 0) {
|
|
dprintk("NFS: %s: Unexpected direction from server\n",
|
|
dprintk("NFS: %s: Unexpected direction from server\n",
|
|
__func__);
|
|
__func__);
|
|
- status = -EIO;
|
|
|
|
- goto out;
|
|
|
|
|
|
+ return -EIO;
|
|
}
|
|
}
|
|
if (res.use_conn_in_rdma_mode != args.use_conn_in_rdma_mode) {
|
|
if (res.use_conn_in_rdma_mode != args.use_conn_in_rdma_mode) {
|
|
dprintk("NFS: %s: Server returned RDMA mode = true\n",
|
|
dprintk("NFS: %s: Server returned RDMA mode = true\n",
|
|
__func__);
|
|
__func__);
|
|
- status = -EIO;
|
|
|
|
- goto out;
|
|
|
|
|
|
+ return -EIO;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-out:
|
|
|
|
- dprintk("<-- %s status= %d\n", __func__, status);
|
|
|
|
|
|
+
|
|
return status;
|
|
return status;
|
|
}
|
|
}
|
|
|
|
|