This update fixes an oddity when a device is first added
and then removed from dev_list in case of initialization
failure, instead of just being added in case of success.
Signed-off-by: Alexander Gordeev <agord...@redhat.com>
---
drivers/block/nvme-core.c | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
index e1e4ad4..e4e12be 100644
--- a/drivers/block/nvme-core.c
+++ b/drivers/block/nvme-core.c
@@ -2105,29 +2105,26 @@ static int nvme_dev_start(struct nvme_dev *dev)
if (result)
goto unmap;
- spin_lock(&dev_list_lock);
- list_add(&dev->node, &dev_list);
- spin_unlock(&dev_list_lock);
-
result = set_queue_count(dev, num_online_cpus());
if (result == -EBUSY)
- return -EBUSY;
+ goto adddev;
nvme_teardown_admin_queue(dev);
if (result)
- goto disable;
+ goto unmap;
result = nvme_setup_io_queues(dev, result);
if (result)
- goto disable;
-
- return 0;
+ goto unmap;
- disable:
+ adddev:
spin_lock(&dev_list_lock);
- list_del_init(&dev->node);
+ list_add(&dev->node, &dev_list);
spin_unlock(&dev_list_lock);
+
+ return result;
+
unmap:
nvme_dev_unmap(dev);
return result;
--
1.7.7.6
--
Regards,
Alexander Gordeev
agord...@redhat.com
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
