diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2010-06-16 09:52:26 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2010-06-22 13:24:02 -0400 |
commit | a2118c33aad6c447ad5e0a60cfaea3939b52ce0a (patch) | |
tree | bc30d269d75460707dc1f03d1c121837ee9e25b8 /fs/nfs/nfs4proc.c | |
parent | df8964554a4e19c8ddcc4d9c642c4d267662d770 (diff) |
NFSv41: Don't store session state in the nfs_client->cl_state
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfs4proc.c')
-rw-r--r-- | fs/nfs/nfs4proc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index a896bfbd520a..fc972c6f1ce9 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c | |||
@@ -356,7 +356,7 @@ static void nfs41_check_drain_session_complete(struct nfs4_session *ses) | |||
356 | { | 356 | { |
357 | struct rpc_task *task; | 357 | struct rpc_task *task; |
358 | 358 | ||
359 | if (!test_bit(NFS4CLNT_SESSION_DRAINING, &ses->clp->cl_state)) { | 359 | if (!test_bit(NFS4_SESSION_DRAINING, &ses->session_state)) { |
360 | task = rpc_wake_up_next(&ses->fc_slot_table.slot_tbl_waitq); | 360 | task = rpc_wake_up_next(&ses->fc_slot_table.slot_tbl_waitq); |
361 | if (task) | 361 | if (task) |
362 | rpc_task_set_priority(task, RPC_PRIORITY_PRIVILEGED); | 362 | rpc_task_set_priority(task, RPC_PRIORITY_PRIVILEGED); |
@@ -489,7 +489,7 @@ static int nfs41_setup_sequence(struct nfs4_session *session, | |||
489 | tbl = &session->fc_slot_table; | 489 | tbl = &session->fc_slot_table; |
490 | 490 | ||
491 | spin_lock(&tbl->slot_tbl_lock); | 491 | spin_lock(&tbl->slot_tbl_lock); |
492 | if (test_bit(NFS4CLNT_SESSION_DRAINING, &session->clp->cl_state) && | 492 | if (test_bit(NFS4_SESSION_DRAINING, &session->session_state) && |
493 | !rpc_task_has_priority(task, RPC_PRIORITY_PRIVILEGED)) { | 493 | !rpc_task_has_priority(task, RPC_PRIORITY_PRIVILEGED)) { |
494 | /* | 494 | /* |
495 | * The state manager will wait until the slot table is empty. | 495 | * The state manager will wait until the slot table is empty. |