summaryrefslogtreecommitdiff
path: root/drivers/block
diff options
context:
space:
mode:
authorkaoudis <kaoudis@colorado.edu>2015-01-15 07:01:58 +0300
committerJens Axboe <axboe@fb.com>2015-01-22 07:51:57 +0300
commit121c7ad4ef3f3a9e697c4b8b78d74e4d6847d9e4 (patch)
tree147d73c726847fdf27b77e32bb3acf401200732d /drivers/block
parent227290b4690510148d1f40f277c6c3a181fcb440 (diff)
downloadlinux-121c7ad4ef3f3a9e697c4b8b78d74e4d6847d9e4.tar.xz
NVMe: within nvme_free_queues(), delete RCU sychro/deferred free
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 <keith.busch@intel.com> Signed-off-by: Kelly Nicole Kaoudis <kaoudis@colorado.edu> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/nvme-core.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
index f7d083bb3bd5..f4aa64160838 100644
--- 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);
+ }
}
/**