From 05c5e44b8a8bfbd8f0669202735fd14a701b06f5 Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Mon, 25 Mar 2013 11:23:40 -0400 Subject: [PATCH] --- yaml --- r: 361778 b: refs/heads/master c: 1166fde6a923c30f4351515b6a9a1efc513e7d00 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/sunrpc/sched.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index bba343126101..af9f32a5174b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 240286725d854331422cb15957f8d9bf2741d4e3 +refs/heads/master: 1166fde6a923c30f4351515b6a9a1efc513e7d00 diff --git a/trunk/net/sunrpc/sched.c b/trunk/net/sunrpc/sched.c index fb20f25ddec9..f8529fc8e542 100644 --- a/trunk/net/sunrpc/sched.c +++ b/trunk/net/sunrpc/sched.c @@ -180,6 +180,8 @@ static void __rpc_add_wait_queue(struct rpc_wait_queue *queue, list_add_tail(&task->u.tk_wait.list, &queue->tasks[0]); task->tk_waitqueue = queue; queue->qlen++; + /* barrier matches the read in rpc_wake_up_task_queue_locked() */ + smp_wmb(); rpc_set_queued(task); dprintk("RPC: %5u added to queue %p \"%s\"\n", @@ -430,8 +432,11 @@ static void __rpc_do_wake_up_task(struct rpc_wait_queue *queue, struct rpc_task */ static void rpc_wake_up_task_queue_locked(struct rpc_wait_queue *queue, struct rpc_task *task) { - if (RPC_IS_QUEUED(task) && task->tk_waitqueue == queue) - __rpc_do_wake_up_task(queue, task); + if (RPC_IS_QUEUED(task)) { + smp_rmb(); + if (task->tk_waitqueue == queue) + __rpc_do_wake_up_task(queue, task); + } } /*