From 1a4448f308908307c7f1540e44175aef373e649d Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Tue, 8 Jan 2013 09:31:13 -0500
Subject: [PATCH] --- yaml --- r: 352959 b: refs/heads/master c:
 3dc0da278e2b26fa8e353b3a962b2c89e184d353 h: refs/heads/master i:   352957:
 c9a06843628f6518d0882649c06950f5b84d2bfa   352955:
 3ae9de44942a6cf28b7e1543e02e91dfe4e98f6f   352951:
 a06e78843b4666585e73128823b2439715b11f71   352943:
 37e62bcd6e09b3347c810e98484743bd85ed0aca   352927:
 950259488e06455d17f29a02d47b2f1ac56f039d   352895:
 e61a585d6015ec7b6c1d8cf5746a04aa3640d7de v: v3

---
 [refs]                      | 2 +-
 trunk/net/sunrpc/xprtsock.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ad517a9efedf..b2717e3a81af 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b092092bf0e2e8b7af1c2a03f615b4e60b05d47
+refs/heads/master: 3dc0da278e2b26fa8e353b3a962b2c89e184d353
diff --git a/trunk/net/sunrpc/xprtsock.c b/trunk/net/sunrpc/xprtsock.c
index 1897181d7438..f7d6e4f8c162 100644
--- a/trunk/net/sunrpc/xprtsock.c
+++ b/trunk/net/sunrpc/xprtsock.c
@@ -1731,7 +1731,9 @@ static int xs_bind(struct sock_xprt *transport, struct socket *sock)
  */
 static void xs_local_rpcbind(struct rpc_task *task)
 {
-	xprt_set_bound(task->tk_xprt);
+	rcu_read_lock();
+	xprt_set_bound(rcu_dereference(task->tk_client->cl_xprt));
+	rcu_read_unlock();
 }
 
 static void xs_local_set_port(struct rpc_xprt *xprt, unsigned short port)