From 98370e2688448671348b3757fef6ab882f4b32b0 Mon Sep 17 00:00:00 2001 From: Andy Adamson Date: Wed, 9 Nov 2011 13:58:26 -0500 Subject: [PATCH] --- yaml --- r: 282937 b: refs/heads/master c: 0b1c8fc43c1f9fcde2d18182988f05eeaaae509b h: refs/heads/master i: 282935: 46471fc312ea2a437ec2a6dc5b291717d7345ca6 v: v3 --- [refs] | 2 +- trunk/fs/nfs/nfs4proc.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index bf1942ba84a7..643fcef66bd3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aabd0b40b327d5c6518c8c908819b9bf864ad56a +refs/heads/master: 0b1c8fc43c1f9fcde2d18182988f05eeaaae509b diff --git a/trunk/fs/nfs/nfs4proc.c b/trunk/fs/nfs/nfs4proc.c index b2104461ed4f..fcc2408d7ab0 100644 --- a/trunk/fs/nfs/nfs4proc.c +++ b/trunk/fs/nfs/nfs4proc.c @@ -552,13 +552,10 @@ int nfs41_setup_sequence(struct nfs4_session *session, spin_lock(&tbl->slot_tbl_lock); if (test_bit(NFS4_SESSION_DRAINING, &session->session_state) && !rpc_task_has_priority(task, RPC_PRIORITY_PRIVILEGED)) { - /* - * The state manager will wait until the slot table is empty. - * Schedule the reset thread - */ + /* The state manager will wait until the slot table is empty */ rpc_sleep_on(&tbl->slot_tbl_waitq, task, NULL); spin_unlock(&tbl->slot_tbl_lock); - dprintk("%s Schedule Session Reset\n", __func__); + dprintk("%s session is draining\n", __func__); return -EAGAIN; }