Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b9e2d41 authored by Andy Adamson's avatar Andy Adamson Committed by Trond Myklebust
Browse files

nfs41: only state manager sets NFS4CLNT_SESSION_SETUP 



Replace sync and async handlers setting of the NFS4CLNT_SESSION_SETUP bit with
setting NFS4CLNT_CHECK_LEASE, and let the state manager decide to reset the session.

Signed-off-by: default avatarAndy Adamson <andros@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 691daf3b

fs/nfs/nfs4proc.c

+3 −3
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ static int nfs4_handle_exception(const struct nfs_server *server, int errorcode, 
		case -NFS4ERR_SEQ_MISORDERED:

			dprintk("%s ERROR: %d Reset session\n", __func__,

				errorcode);

			set_bit(NFS4CLNT_SESSION_RESET, &clp->cl_state);

			nfs4_schedule_state_recovery(clp);

			exception->retry = 1;

			break;

#endif /* !defined(CONFIG_NFS_V4_1) */
@@ -466,7 +466,7 @@ static int nfs41_setup_sequence(struct nfs4_session *session, 
	tbl = &session->fc_slot_table;



	spin_lock(&tbl->slot_tbl_lock);

	if (test_bit(NFS4CLNT_SESSION_RESET, &session->clp->cl_state)) {

	if (test_bit(NFS4CLNT_SESSION_DRAINING, &session->clp->cl_state)) {

		/*

		 * The state manager will wait until the slot table is empty.

		 * Schedule the reset thread
@@ -3368,7 +3368,7 @@ _nfs4_async_handle_error(struct rpc_task *task, const struct nfs_server *server, 
		case -NFS4ERR_SEQ_MISORDERED:

			dprintk("%s ERROR %d, Reset session\n", __func__,

				task->tk_status);

			set_bit(NFS4CLNT_SESSION_RESET, &clp->cl_state);

			nfs4_schedule_state_recovery(clp);

			task->tk_status = 0;

			return -EAGAIN;

#endif /* CONFIG_NFS_V4_1 */

fs/nfs/nfs4state.c

+3 −1
Original line number Diff line number Diff line
@@ -1094,6 +1094,8 @@ static int nfs4_recovery_handle_error(struct nfs_client *clp, int error) 
		case -NFS4ERR_SEQ_FALSE_RETRY:

		case -NFS4ERR_SEQ_MISORDERED:

			set_bit(NFS4CLNT_SESSION_RESET, &clp->cl_state);

			/* Zero session reset errors */

			return 0;

	}

	return error;

}
@@ -1191,7 +1193,6 @@ static int nfs4_reset_session(struct nfs_client *clp) 
		set_bit(NFS4CLNT_SESSION_DRAINING, &clp->cl_state);

		spin_unlock(&tbl->slot_tbl_lock);

		status = wait_for_completion_interruptible(&ses->complete);

		clear_bit(NFS4CLNT_SESSION_DRAINING, &clp->cl_state);

		if (status) /* -ERESTARTSYS */

			goto out;

	} else {
@@ -1212,6 +1213,7 @@ static int nfs4_reset_session(struct nfs_client *clp) 
		/* fall through*/

out:

	/* Wake up the next rpc task even on error */

	clear_bit(NFS4CLNT_SESSION_DRAINING, &clp->cl_state);

	rpc_wake_up_next(&clp->cl_session->fc_slot_table.slot_tbl_waitq);

	return status;

}