diff options
| author | Chuck Lever | 2015-09-24 09:34:21 +0200 |
|---|---|---|
| committer | Doug Ledford | 2015-09-25 16:46:51 +0200 |
| commit | bb6c96d72879fe1f674a804eb95b891def4ace61 (patch) | |
| tree | 5377d9e4b36358f4ddb6e4f43909005c2a9a5b85 /net/sunrpc/xprtrdma/verbs.c | |
| parent | Merge tag 'v4.3-rc2' into k.o/for-4.3-v1 (diff) | |
| download | kernel-qcow2-linux-bb6c96d72879fe1f674a804eb95b891def4ace61.tar.gz kernel-qcow2-linux-bb6c96d72879fe1f674a804eb95b891def4ace61.tar.xz kernel-qcow2-linux-bb6c96d72879fe1f674a804eb95b891def4ace61.zip | |
xprtrdma: Replace global lkey with lkey local to PD
The core API has changed so that devices that do not have a global
DMA lkey automatically create an mr, per-PD, and make that lkey
available. The global DMA lkey interface is going away in favor of
the per-PD DMA lkey.
The per-PD DMA lkey is always available. Convert xprtrdma to use the
device's per-PD DMA lkey for regbufs, no matter which memory
registration scheme is in use.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Sagi Grimberg <sagig@mellanox.com>
Cc: linux-nfs <linux-nfs@vger.kernel.org>
Acked-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'net/sunrpc/xprtrdma/verbs.c')
| -rw-r--r-- | net/sunrpc/xprtrdma/verbs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c index 682996779970..eb081ad05e33 100644 --- a/net/sunrpc/xprtrdma/verbs.c +++ b/net/sunrpc/xprtrdma/verbs.c @@ -1252,7 +1252,7 @@ rpcrdma_alloc_regbuf(struct rpcrdma_ia *ia, size_t size, gfp_t flags) goto out_free; iov->length = size; - iov->lkey = ia->ri_dma_lkey; + iov->lkey = ia->ri_pd->local_dma_lkey; rb->rg_size = size; rb->rg_owner = NULL; return rb; |