diff options
| author | Jeff Layton | 2015-06-03 22:14:29 +0200 |
|---|---|---|
| committer | Trond Myklebust | 2015-06-11 00:26:26 +0200 |
| commit | d67fa4d85a2143b46052b2e9ccc6749a4c97b2de (patch) | |
| tree | a594a793ca2c827f383965e25d0a5d2d2a790287 /net/sunrpc/clnt.c | |
| parent | sunrpc: lock xprt before trying to set memalloc on the sockets (diff) | |
| download | kernel-qcow2-linux-d67fa4d85a2143b46052b2e9ccc6749a4c97b2de.tar.gz kernel-qcow2-linux-d67fa4d85a2143b46052b2e9ccc6749a4c97b2de.tar.xz kernel-qcow2-linux-d67fa4d85a2143b46052b2e9ccc6749a4c97b2de.zip | |
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: goto retry; } - ret = xs_swapper_enable(xprt); + ret = xprt_enable_swap(xprt); xprt_put(xprt); } return ret; @@ -2522,7 +2522,7 @@ retry: goto retry; } - xs_swapper_disable(xprt); + xprt_disable_swap(xprt); xprt_put(xprt); } } |