summaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2012-11-01 16:44:05 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2012-12-06 00:30:51 +0100
commit1e1093c7fd4951bb4272212c238d09cd7a22f5fc (patch)
tree6a4abee1ee3a3e45fad908761cecd1e4a8a650e4 /fs/nfs
parent104287cd4ebb5484c654551c102c25c94227f717 (diff)
downloadlinux-stable-1e1093c7fd4951bb4272212c238d09cd7a22f5fc.tar.gz
linux-stable-1e1093c7fd4951bb4272212c238d09cd7a22f5fc.tar.bz2
linux-stable-1e1093c7fd4951bb4272212c238d09cd7a22f5fc.zip
NFSv4.1: Don't mess with task priorities in nfs41_setup_sequence
We want to preserve the rpc_task priority for things like writebacks, that may have differing levels of urgency. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/nfs4proc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 7f8b42781338..99d99a5a3f61 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -536,8 +536,6 @@ int nfs41_setup_sequence(struct nfs4_session *session,
}
spin_unlock(&tbl->slot_tbl_lock);
- rpc_task_set_priority(task, RPC_PRIORITY_NORMAL);
-
args->sa_slot = slot;
dprintk("<-- %s slotid=%d seqid=%d\n", __func__,
@@ -556,8 +554,10 @@ out_success:
out_sleep:
/* Privileged tasks are queued with top priority */
if (args->sa_privileged)
- rpc_task_set_priority(task, RPC_PRIORITY_PRIVILEGED);
- rpc_sleep_on(&tbl->slot_tbl_waitq, task, NULL);
+ rpc_sleep_on_priority(&tbl->slot_tbl_waitq, task,
+ NULL, RPC_PRIORITY_PRIVILEGED);
+ else
+ rpc_sleep_on(&tbl->slot_tbl_waitq, task, NULL);
spin_unlock(&tbl->slot_tbl_lock);
return -EAGAIN;
}