Skip to content

Commit

Permalink
nfs41: clear NFS4CLNT_RECALL_SLOT bit on session reset
Browse files Browse the repository at this point in the history
Signed-off-by: Andy Adamson <andros@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
  • Loading branch information
Andy Adamson authored and Trond Myklebust committed Feb 10, 2010
1 parent bae0ac0 commit 41f54a5
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions fs/nfs/nfs4state.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
status = nfs4_proc_create_session(clp);
if (status)
if (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);

out:
return status;
}

Expand Down

0 comments on commit 41f54a5

Please sign in to comment.