---

yaml --- r: 352961 b: refs/heads/master c: 45bc0dc h: refs/heads/master i: 352959: 1a4448f v: v3
git-mirror · Feb 1, 2013 · 11eed19 · 11eed19
1 parent 47445a0
commit 11eed19
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a24dfb645dbcb05b34d08b991d082bdaa3ff072
+refs/heads/master: 45bc0dce9879505d6fd9ff68dcd0359fb260dfd7
diff --git a/trunk/net/sunrpc/xprt.c b/trunk/net/sunrpc/xprt.c
@@ -1093,15 +1093,18 @@ EXPORT_SYMBOL_GPL(xprt_free);
  */
 void xprt_reserve(struct rpc_task *task)
 {
-	struct rpc_xprt	*xprt = task->tk_xprt;
+	struct rpc_xprt	*xprt;
 
 	task->tk_status = 0;
 	if (task->tk_rqstp != NULL)
 		return;
 
 	task->tk_timeout = 0;
 	task->tk_status = -EAGAIN;
+	rcu_read_lock();
+	xprt = rcu_dereference(task->tk_client->cl_xprt);
 	xprt->ops->alloc_slot(xprt, task);
+	rcu_read_unlock();
 }
 
 static inline __be32 xprt_alloc_xid(struct rpc_xprt *xprt)