nfs41: remove nfs4_recover_session
nfs4_recover_session can put rpciod to sleep. Just use nfs4_schedule_recovery. Reported-by: Trond Myklebust <trond.myklebust@netapp.com> Signed-off-by: Andy Adamson <andros@netapp.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
parent
2628eddff1
commit
05f0d23647
|
@ -436,24 +436,6 @@ out:
|
||||||
return ret_id;
|
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,
|
static int nfs41_setup_sequence(struct nfs4_session *session,
|
||||||
struct nfs4_sequence_args *args,
|
struct nfs4_sequence_args *args,
|
||||||
struct nfs4_sequence_res *res,
|
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 *slot;
|
||||||
struct nfs4_slot_table *tbl;
|
struct nfs4_slot_table *tbl;
|
||||||
int status = 0;
|
|
||||||
u8 slotid;
|
u8 slotid;
|
||||||
|
|
||||||
dprintk("--> %s\n", __func__);
|
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 */
|
/* The slot table is empty; start the reset thread */
|
||||||
dprintk("%s Session Reset\n", __func__);
|
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);
|
spin_unlock(&tbl->slot_tbl_lock);
|
||||||
status = nfs4_recover_session(session);
|
return -EAGAIN;
|
||||||
if (status)
|
|
||||||
return status;
|
|
||||||
spin_lock(&tbl->slot_tbl_lock);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
slotid = nfs4_find_slot(tbl, task);
|
slotid = nfs4_find_slot(tbl, task);
|
||||||
|
|
Loading…
Reference in a new issue