aboutsummaryrefslogtreecommitdiffstats
path: root/net/sunrpc/xprtsock.c
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2013-01-08 09:26:49 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2013-02-01 10:13:47 -0500
commit1b092092bf0e2e8b7af1c2a03f615b4e60b05d47 (patch)
tree4efc332b4648144fa055fa72f1867cbc2b30e756 /net/sunrpc/xprtsock.c
parenta4f0835c604f80f945ab3e72ffd00547145c4b2b (diff)
SUNRPC: Pass a pointer to struct rpc_xprt to the connect callback
Avoid another RCU dereference by passing the pointer to struct rpc_xprt from the caller. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'net/sunrpc/xprtsock.c')
-rw-r--r--net/sunrpc/xprtsock.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 25838901c97f..1897181d7438 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -2205,6 +2205,7 @@ out:
2205 2205
2206/** 2206/**
2207 * xs_connect - connect a socket to a remote endpoint 2207 * xs_connect - connect a socket to a remote endpoint
2208 * @xprt: pointer to transport structure
2208 * @task: address of RPC task that manages state of connect request 2209 * @task: address of RPC task that manages state of connect request
2209 * 2210 *
2210 * TCP: If the remote end dropped the connection, delay reconnecting. 2211 * TCP: If the remote end dropped the connection, delay reconnecting.
@@ -2216,9 +2217,8 @@ out:
2216 * If a UDP socket connect fails, the delay behavior here prevents 2217 * If a UDP socket connect fails, the delay behavior here prevents
2217 * retry floods (hard mounts). 2218 * retry floods (hard mounts).
2218 */ 2219 */
2219static void xs_connect(struct rpc_task *task) 2220static void xs_connect(struct rpc_xprt *xprt, struct rpc_task *task)
2220{ 2221{
2221 struct rpc_xprt *xprt = task->tk_xprt;
2222 struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt); 2222 struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt);
2223 2223
2224 if (transport->sock != NULL && !RPC_IS_SOFTCONN(task)) { 2224 if (transport->sock != NULL && !RPC_IS_SOFTCONN(task)) {