浏览代码

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>
Chuck Lever 9 年之前
父节点
当前提交
6e14a92c36
共有 2 个文件被更改,包括 0 次插入4 次删除
  1. 0 3
      net/sunrpc/xprtrdma/verbs.c
  2. 0 1
      net/sunrpc/xprtrdma/xprt_rdma.h

+ 0 - 3
net/sunrpc/xprtrdma/verbs.c

@@ -433,7 +433,6 @@ rpcrdma_ia_open(struct rpcrdma_xprt *xprt, struct sockaddr *addr, int memreg)
 	dprintk("RPC:       %s: memory registration strategy is '%s'\n",
 	dprintk("RPC:       %s: memory registration strategy is '%s'\n",
 		__func__, ia->ri_ops->ro_displayname);
 		__func__, ia->ri_ops->ro_displayname);
 
 
-	rwlock_init(&ia->ri_qplock);
 	return 0;
 	return 0;
 
 
 out3:
 out3:
@@ -672,10 +671,8 @@ retry:
 			goto out;
 			goto out;
 		}
 		}
 
 
-		write_lock(&ia->ri_qplock);
 		old = ia->ri_id;
 		old = ia->ri_id;
 		ia->ri_id = id;
 		ia->ri_id = id;
-		write_unlock(&ia->ri_qplock);
 
 
 		rdma_destroy_qp(old);
 		rdma_destroy_qp(old);
 		rpcrdma_destroy_id(old);
 		rpcrdma_destroy_id(old);

+ 0 - 1
net/sunrpc/xprtrdma/xprt_rdma.h

@@ -65,7 +65,6 @@
  */
  */
 struct rpcrdma_ia {
 struct rpcrdma_ia {
 	const struct rpcrdma_memreg_ops	*ri_ops;
 	const struct rpcrdma_memreg_ops	*ri_ops;
-	rwlock_t		ri_qplock;
 	struct ib_device	*ri_device;
 	struct ib_device	*ri_device;
 	struct rdma_cm_id 	*ri_id;
 	struct rdma_cm_id 	*ri_id;
 	struct ib_pd		*ri_pd;
 	struct ib_pd		*ri_pd;