diff options
| author |   Chuck Lever <chuck.lever@oracle.com> | 2016-05-02 14:42:54 -0400 |
|---|---|---|
| committer |   Anna Schumaker <Anna.Schumaker@Netapp.com> | 2016-05-17 15:48:04 -0400 |
| commit | 0b043b9fb5dabcb6f187136cc685b26a7f8bcdb1 (patch) | |
| tree | 9b4f6900593c022a69852d3ab3a94bf8d7117c51 /net/sunrpc/xprtrdma/fmr_ops.c | |
| parent | xprtrdma: Add ro_unmap_safe memreg method (diff) | |
| download | linux-dev-0b043b9fb5dabcb6f187136cc685b26a7f8bcdb1.tar.xz linux-dev-0b043b9fb5dabcb6f187136cc685b26a7f8bcdb1.zip | |
xprtrdma: Remove ro_unmap() from all registration modes
Clean up: The ro_unmap method is no longer used.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Tested-by: Steve Wise <swise@opengridcomputing.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Diffstat (limited to 'net/sunrpc/xprtrdma/fmr_ops.c')
| -rw-r--r-- | net/sunrpc/xprtrdma/fmr_ops.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/net/sunrpc/xprtrdma/fmr_ops.c b/net/sunrpc/xprtrdma/fmr_ops.c index a658dcffba71..6326ebe8b595 100644 --- a/net/sunrpc/xprtrdma/fmr_ops.c +++ b/net/sunrpc/xprtrdma/fmr_ops.c @@ -328,36 +328,6 @@ fmr_op_unmap_safe(struct rpcrdma_xprt *r_xprt, struct rpcrdma_req *req, } } -/* Use the ib_unmap_fmr() verb to prevent further remote - * access via RDMA READ or RDMA WRITE. - */ -static int -fmr_op_unmap(struct rpcrdma_xprt *r_xprt, struct rpcrdma_mr_seg *seg) -{ - struct rpcrdma_ia *ia = &r_xprt->rx_ia; - struct rpcrdma_mr_seg *seg1 = seg; - struct rpcrdma_mw *mw = seg1->rl_mw; - int rc, nsegs = seg->mr_nsegs; - - dprintk("RPC: %s: FMR %p\n", __func__, mw); - - seg1->rl_mw = NULL; - while (seg1->mr_nsegs--) - rpcrdma_unmap_one(ia->ri_device, seg++); - rc = __fmr_unmap(mw); - if (rc) - goto out_err; - rpcrdma_put_mw(r_xprt, mw); - return nsegs; - -out_err: - /* The FMR is abandoned, but remains in rb_all. fmr_op_destroy - * will attempt to release it when the transport is destroyed. - */ - dprintk("RPC: %s: ib_unmap_fmr status %i\n", __func__, rc); - return nsegs; -} - static void fmr_op_destroy(struct rpcrdma_buffer *buf) { @@ -382,7 +352,6 @@ const struct rpcrdma_memreg_ops rpcrdma_fmr_memreg_ops = { .ro_map = fmr_op_map, .ro_unmap_sync = fmr_op_unmap_sync, .ro_unmap_safe = fmr_op_unmap_safe, - .ro_unmap = fmr_op_unmap, .ro_open = fmr_op_open, .ro_maxpages = fmr_op_maxpages, .ro_init = fmr_op_init, |