|
@@ -1291,17 +1291,17 @@ static int nfs4_reset_session(struct nfs_client *clp)
|
|
|
|
|
|
memset(clp->cl_session->sess_id.data, 0, NFS4_MAX_SESSIONID_LEN);
|
|
memset(clp->cl_session->sess_id.data, 0, NFS4_MAX_SESSIONID_LEN);
|
|
status = nfs4_proc_create_session(clp);
|
|
status = nfs4_proc_create_session(clp);
|
|
- if (status)
|
|
|
|
|
|
+ if (status) {
|
|
status = nfs4_recovery_handle_error(clp, status);
|
|
status = nfs4_recovery_handle_error(clp, status);
|
|
|
|
+ goto out;
|
|
|
|
+ }
|
|
|
|
+ /* create_session negotiated new slot table */
|
|
|
|
+ clear_bit(NFS4CLNT_RECALL_SLOT, &clp->cl_state);
|
|
|
|
|
|
-out:
|
|
|
|
- /*
|
|
|
|
- * Let the state manager reestablish state
|
|
|
|
- */
|
|
|
|
- if (!test_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state) &&
|
|
|
|
- status == 0)
|
|
|
|
|
|
+ /* Let the state manager reestablish state */
|
|
|
|
+ if (!test_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state))
|
|
nfs41_setup_state_renewal(clp);
|
|
nfs41_setup_state_renewal(clp);
|
|
-
|
|
|
|
|
|
+out:
|
|
return status;
|
|
return status;
|
|
}
|
|
}
|
|
|
|
|