diff --git a/[refs] b/[refs] index 93e9d5917632..41b1990353c9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 159e0561e322dd8008fff59e36efff8d2bdd0b0e +refs/heads/master: 506026c3ec270e18402f0c9d33fee37482c23861 diff --git a/trunk/net/sunrpc/sched.c b/trunk/net/sunrpc/sched.c index 994cfea2bad6..ada1e2c33aa4 100644 --- a/trunk/net/sunrpc/sched.c +++ b/trunk/net/sunrpc/sched.c @@ -300,8 +300,9 @@ EXPORT_SYMBOL_GPL(__rpc_wait_for_completion_task); /* * Make an RPC task runnable. * - * Note: If the task is ASYNC, this must be called with - * the spinlock held to protect the wait queue operation. + * Note: If the task is ASYNC, and is being made runnable after sitting on an + * rpc_wait_queue, this must be called with the queue spinlock held to protect + * the wait queue operation. */ static void rpc_make_runnable(struct rpc_task *task) {