1 files changed, 8 insertions, 22 deletions

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 18ca6879d8de..d90132642340 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -2553,9 +2553,8 @@ static int nfs41_check_open_stateid(struct nfs4_state *state)
                 clear_bit(NFS_O_RDWR_STATE, &state->flags);
                 clear_bit(NFS_OPEN_STATE, &state->flags);
                 stateid->type = NFS4_INVALID_STATEID_TYPE;
-        }
-        if (status != NFS_OK)
                 return status;
+        }
         if (nfs_open_stateid_recover_openmode(state))
                 return -NFS4ERR_OPENMODE;
         return NFS_OK;
@@ -7461,7 +7460,7 @@ static void nfs4_exchange_id_done(struct rpc_task *task, void *data)
                         cdata->res.server_scope = NULL;
                 }
                 /* Save the EXCHANGE_ID verifier session trunk tests */
-                memcpy(clp->cl_confirm.data, cdata->args.verifier->data,
+                memcpy(clp->cl_confirm.data, cdata->args.verifier.data,
                        sizeof(clp->cl_confirm.data));
         }
 out:
@@ -7474,10 +7473,6 @@ static void nfs4_exchange_id_release(void *data)
         struct nfs41_exchange_id_data *cdata =
                                         (struct nfs41_exchange_id_data *)data;
 
-        if (cdata->xprt) {
-                xprt_put(cdata->xprt);
-                rpc_clnt_xprt_switch_put(cdata->args.client->cl_rpcclient);
-        }
         nfs_put_client(cdata->args.client);
         kfree(cdata->res.impl_id);
         kfree(cdata->res.server_scope);
@@ -7498,7 +7493,6 @@ static const struct rpc_call_ops nfs4_exchange_id_call_ops = {
 static int _nfs4_proc_exchange_id(struct nfs_client *clp, struct rpc_cred *cred,
                         u32 sp4_how, struct rpc_xprt *xprt)
 {
-        nfs4_verifier verifier;
         struct rpc_message msg = {
                 .rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_EXCHANGE_ID],
                 .rpc_cred = cred,
@@ -7507,7 +7501,7 @@ static int _nfs4_proc_exchange_id(struct nfs_client *clp, struct rpc_cred *cred,
                 .rpc_client = clp->cl_rpcclient,
                 .callback_ops = &nfs4_exchange_id_call_ops,
                 .rpc_message = &msg,
-                .flags = RPC_TASK_ASYNC | RPC_TASK_TIMEOUT,
+                .flags = RPC_TASK_TIMEOUT,
         };
         struct nfs41_exchange_id_data *calldata;
         struct rpc_task *task;
@@ -7522,8 +7516,7 @@ static int _nfs4_proc_exchange_id(struct nfs_client *clp, struct rpc_cred *cred,
                 return -ENOMEM;
         }
 
-        if (!xprt)
-                nfs4_init_boot_verifier(clp, &verifier);
+        nfs4_init_boot_verifier(clp, &calldata->args.verifier);
 
         status = nfs4_init_uniform_client_string(clp);
         if (status)
@@ -7562,11 +7555,9 @@ static int _nfs4_proc_exchange_id(struct nfs_client *clp, struct rpc_cred *cred,
         if (xprt) {
                 calldata->xprt = xprt;
                 task_setup_data.rpc_xprt = xprt;
-                task_setup_data.flags =
-                                RPC_TASK_SOFT|RPC_TASK_SOFTCONN|RPC_TASK_ASYNC;
-                calldata->args.verifier = &clp->cl_confirm;
-        } else {
-                calldata->args.verifier = &verifier;
+                task_setup_data.flags |= RPC_TASK_SOFTCONN;
+                memcpy(calldata->args.verifier.data, clp->cl_confirm.data,
+                                sizeof(calldata->args.verifier.data));
         }
         calldata->args.client = clp;
 #ifdef CONFIG_NFS_V4_1_MIGRATION
@@ -7585,12 +7576,7 @@ static int _nfs4_proc_exchange_id(struct nfs_client *clp, struct rpc_cred *cred,
         if (IS_ERR(task))
                 return PTR_ERR(task);
 
-        if (!xprt) {
-                status = rpc_wait_for_completion_task(task);
-                if (!status)
-                        status = calldata->rpc_status;
-        } else  /* session trunking test */
-                status = calldata->rpc_status;
+        status = calldata->rpc_status;
 
         rpc_put_task(task);
 out: