aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2016-05-04 10:41:48 -0400
committerAnna Schumaker <Anna.Schumaker@Netapp.com>2016-05-17 15:48:05 -0400
commit6e14a92c363e1f42c6e1339da8413fcfbe1bdc3a (patch)
treed7f621cc2ad64b62437fa13c353ba1af9407e4cb
parentb2dde94bfa374b9e851756ab8191209f1a604e0a (diff)
xprtrdma: Remove qplock
Clean up. After "xprtrdma: Remove ro_unmap() from all registration modes", there are no longer any sites that take rpcrdma_ia::qplock for read. The one site that takes it for write is always single-threaded. It is safe to remove it. Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
-rw-r--r--net/sunrpc/xprtrdma/verbs.c3
-rw-r--r--net/sunrpc/xprtrdma/xprt_rdma.h1
2 files changed, 0 insertions, 4 deletions
diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c
index be66f658308c..b044d98a1370 100644
--- a/net/sunrpc/xprtrdma/verbs.c
+++ b/net/sunrpc/xprtrdma/verbs.c
@@ -433,7 +433,6 @@ rpcrdma_ia_open(struct rpcrdma_xprt *xprt, struct sockaddr *addr, int memreg)
433 dprintk("RPC: %s: memory registration strategy is '%s'\n", 433 dprintk("RPC: %s: memory registration strategy is '%s'\n",
434 __func__, ia->ri_ops->ro_displayname); 434 __func__, ia->ri_ops->ro_displayname);
435 435
436 rwlock_init(&ia->ri_qplock);
437 return 0; 436 return 0;
438 437
439out3: 438out3:
@@ -672,10 +671,8 @@ retry:
672 goto out; 671 goto out;
673 } 672 }
674 673
675 write_lock(&ia->ri_qplock);
676 old = ia->ri_id; 674 old = ia->ri_id;
677 ia->ri_id = id; 675 ia->ri_id = id;
678 write_unlock(&ia->ri_qplock);
679 676
680 rdma_destroy_qp(old); 677 rdma_destroy_qp(old);
681 rpcrdma_destroy_id(old); 678 rpcrdma_destroy_id(old);
diff --git a/net/sunrpc/xprtrdma/xprt_rdma.h b/net/sunrpc/xprtrdma/xprt_rdma.h
index 512bbdcc7d76..95cdc66225ee 100644
--- a/net/sunrpc/xprtrdma/xprt_rdma.h
+++ b/net/sunrpc/xprtrdma/xprt_rdma.h
@@ -65,7 +65,6 @@
65 */ 65 */
66struct rpcrdma_ia { 66struct rpcrdma_ia {
67 const struct rpcrdma_memreg_ops *ri_ops; 67 const struct rpcrdma_memreg_ops *ri_ops;
68 rwlock_t ri_qplock;
69 struct ib_device *ri_device; 68 struct ib_device *ri_device;
70 struct rdma_cm_id *ri_id; 69 struct rdma_cm_id *ri_id;
71 struct ib_pd *ri_pd; 70 struct ib_pd *ri_pd;