diff options
author | Jeff Layton <jlayton@poochiereds.net> | 2015-06-03 16:14:29 -0400 |
---|---|---|
committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-06-10 18:26:26 -0400 |
commit | d67fa4d85a2143b46052b2e9ccc6749a4c97b2de (patch) | |
tree | a594a793ca2c827f383965e25d0a5d2d2a790287 /net/sunrpc/clnt.c | |
parent | d6e971d8ecafee18ff9cc1ac646eb0817ab8b143 (diff) |
sunrpc: turn swapper_enable/disable functions into rpc_xprt_ops
RDMA xprts don't have a sock_xprt, but an rdma_xprt, so the
xs_swapper_enable/disable functions will likely oops when fed an RDMA
xprt. Turn these functions into rpc_xprt_ops so that that doesn't
occur. For now the RDMA versions are no-ops that just return -EINVAL
on an attempt to swapon.
Cc: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Jeff Layton <jeff.layton@primarydata.com>
Reviewed-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'net/sunrpc/clnt.c')
-rw-r--r-- | net/sunrpc/clnt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index 801044aeeedd..576d6ae39f25 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c | |||
@@ -2495,7 +2495,7 @@ retry: | |||
2495 | goto retry; | 2495 | goto retry; |
2496 | } | 2496 | } |
2497 | 2497 | ||
2498 | ret = xs_swapper_enable(xprt); | 2498 | ret = xprt_enable_swap(xprt); |
2499 | xprt_put(xprt); | 2499 | xprt_put(xprt); |
2500 | } | 2500 | } |
2501 | return ret; | 2501 | return ret; |
@@ -2522,7 +2522,7 @@ retry: | |||
2522 | goto retry; | 2522 | goto retry; |
2523 | } | 2523 | } |
2524 | 2524 | ||
2525 | xs_swapper_disable(xprt); | 2525 | xprt_disable_swap(xprt); |
2526 | xprt_put(xprt); | 2526 | xprt_put(xprt); |
2527 | } | 2527 | } |
2528 | } | 2528 | } |