nvmet-rdma: removed queues cleanup from module exit

PATCH New Sagi Grimberg 3 participants 4 messages Nov 13, 2017 – Dec 4, 2017

Subsystems (2)

NVMe NVMe target

lore

Share & tools

lore

Sagi Grimberg

author maintainer

2017-11-13 21:29 UTC #0 lore raw

PATCH 1/1 nvmet-rdma: removed queues cleanup from module exit

We already do that when we are notified in device removal which is triggered when unregistering as an ib client.

Signed-off-by Sagi Grimberg <sagi at grimberg.me>

---
Changes from v1:
- warn if list is not empty after we unregistered the ib_client (which is a definite memory leak)

 drivers/nvme/target/rdma.c | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

drivers/nvme/target/rdma.c +1 ~~-17~~

index 49912909c298..34227ec9491f 100644
@@ -1558,25 +1558,9 @@ static int __init nvmet_rdma_init(void)
 
 static void __exit nvmet_rdma_exit(void)
 {
-	struct nvmet_rdma_queue *queue;
-
 	nvmet_unregister_transport(&nvmet_rdma_ops);
-
-	flush_scheduled_work();
-
-	mutex_lock(&nvmet_rdma_queue_mutex);
-	while ((queue = list_first_entry_or_null(&nvmet_rdma_queue_list,
-			struct nvmet_rdma_queue, queue_list))) {
-		list_del_init(&queue->queue_list);
-
-		mutex_unlock(&nvmet_rdma_queue_mutex);
-		__nvmet_rdma_queue_disconnect(queue);
-		mutex_lock(&nvmet_rdma_queue_mutex);
-	}
-	mutex_unlock(&nvmet_rdma_queue_mutex);
-
-	flush_scheduled_work();
 	ib_unregister_client(&nvmet_rdma_ib_client);
+	WARN_ON_ONCE(!list_empty(&nvmet_rdma_queue_list));
 	ida_destroy(&nvmet_rdma_queue_ida);
 }