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

Commit 05f0d236 authored by Andy Adamson's avatar Andy Adamson Committed by Trond Myklebust
Browse files

nfs41: remove nfs4_recover_session 



nfs4_recover_session can put rpciod to sleep. Just use nfs4_schedule_recovery.

Reported-by: default avatarTrond Myklebust <trond.myklebust@netapp.com>
Signed-off-by: default avatarAndy Adamson <andros@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 2628eddf

fs/nfs/nfs4proc.c

+3 −23
Original line number Diff line number Diff line
@@ -436,24 +436,6 @@ nfs4_find_slot(struct nfs4_slot_table *tbl, struct rpc_task *task) 
	return ret_id;

}



static int nfs4_recover_session(struct nfs4_session *session)

{

	struct nfs_client *clp = session->clp;

	unsigned int loop;

	int ret;



	for (loop = NFS4_MAX_LOOP_ON_RECOVER; loop != 0; loop--) {

		ret = nfs4_wait_clnt_recover(clp);

		if (ret != 0)

			break;

		if (!test_bit(NFS4CLNT_SESSION_RESET, &clp->cl_state))

			break;

		nfs4_schedule_state_manager(clp);

		ret = -EIO;

	}

	return ret;

}



static int nfs41_setup_sequence(struct nfs4_session *session,

				struct nfs4_sequence_args *args,

				struct nfs4_sequence_res *res,
@@ -462,7 +444,6 @@ static int nfs41_setup_sequence(struct nfs4_session *session, 
{

	struct nfs4_slot *slot;

	struct nfs4_slot_table *tbl;

	int status = 0;

	u8 slotid;



	dprintk("--> %s\n", __func__);
@@ -485,11 +466,10 @@ static int nfs41_setup_sequence(struct nfs4_session *session, 


		/* The slot table is empty; start the reset thread */

		dprintk("%s Session Reset\n", __func__);

		rpc_sleep_on(&tbl->slot_tbl_waitq, task, NULL);

		nfs4_schedule_state_manager(session->clp);

		spin_unlock(&tbl->slot_tbl_lock);

		status = nfs4_recover_session(session);

		if (status)

			return status;

		spin_lock(&tbl->slot_tbl_lock);

		return -EAGAIN;

	}



	slotid = nfs4_find_slot(tbl, task);