diff options
| author | Chuck Lever | 2015-03-30 20:34:48 +0200 |
|---|---|---|
| committer | Anna Schumaker | 2015-03-31 15:52:52 +0200 |
| commit | 6814baead86b5d44096ddfbb6f944163578e68c3 (patch) | |
| tree | 56dbce03517cd92027741bcdf6ca24fb929700c0 /net/sunrpc/xprtrdma/rpc_rdma.c | |
| parent | xprtrdma: Add a "register_external" op for each memreg mode (diff) | |
| download | kernel-qcow2-linux-6814baead86b5d44096ddfbb6f944163578e68c3.tar.gz kernel-qcow2-linux-6814baead86b5d44096ddfbb6f944163578e68c3.tar.xz kernel-qcow2-linux-6814baead86b5d44096ddfbb6f944163578e68c3.zip | |
xprtrdma: Add a "deregister_external" op for each memreg mode
There is very little common processing among the different external
memory deregistration functions.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Tested-by: Devesh Sharma <Devesh.Sharma@Emulex.Com>
Tested-by: Meghana Cheripady <Meghana.Cheripady@Emulex.Com>
Tested-by: Veeresh U. Kokatnur <veereshuk@chelsio.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Diffstat (limited to 'net/sunrpc/xprtrdma/rpc_rdma.c')
| -rw-r--r-- | net/sunrpc/xprtrdma/rpc_rdma.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/net/sunrpc/xprtrdma/rpc_rdma.c b/net/sunrpc/xprtrdma/rpc_rdma.c index 6ab1d03d7f3e..2c53ea9e1b83 100644 --- a/net/sunrpc/xprtrdma/rpc_rdma.c +++ b/net/sunrpc/xprtrdma/rpc_rdma.c @@ -284,11 +284,12 @@ rpcrdma_create_chunks(struct rpc_rqst *rqst, struct xdr_buf *target, return (unsigned char *)iptr - (unsigned char *)headerp; out: - if (r_xprt->rx_ia.ri_memreg_strategy != RPCRDMA_FRMR) { - for (pos = 0; nchunks--;) - pos += rpcrdma_deregister_external( - &req->rl_segments[pos], r_xprt); - } + if (r_xprt->rx_ia.ri_memreg_strategy == RPCRDMA_FRMR) + return n; + + for (pos = 0; nchunks--;) + pos += r_xprt->rx_ia.ri_ops->ro_unmap(r_xprt, + &req->rl_segments[pos]); return n; } |