NVMe: within nvme_free_queues(), delete RCU sychro/deferred free

kaoudis · axboe · commit 121c7ad4ef3f · 2015-01-21T21:51:57.000-07:00
Converting from to blk-queue got rid of the driver's RCU
locking-on-queue, so removing unnecessary RCU locking-on-queue
artefacts.

Reviewed-by: Keith Busch &lt;keith.busch@intel.com&gt;

Signed-off-by: Kelly Nicole Kaoudis &lt;kaoudis@colorado.edu&gt;
Signed-off-by: Jens Axboe &lt;axboe@fb.com&gt;
diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
@@ -1108,21 +1108,14 @@ static void nvme_free_queue(struct nvme_queue *nvmeq)
 
 static void nvme_free_queues(struct nvme_dev *dev, int lowest)
 {
-	LLIST_HEAD(q_list);
-	struct nvme_queue *nvmeq, *next;
-	struct llist_node *entry;
 	int i;
 
 	for (i = dev->queue_count - 1; i >= lowest; i--) {
 		struct nvme_queue *nvmeq = dev->queues[i];
-		llist_add(&nvmeq->node, &q_list);
 		dev->queue_count--;
 		dev->queues[i] = NULL;
-	}
-	synchronize_rcu();
-	entry = llist_del_all(&q_list);
-	llist_for_each_entry_safe(nvmeq, next, entry, node)
 		nvme_free_queue(nvmeq);
+	}
 }
 
 /**
