lkml.org 
[lkml]   [2014]   [Jan]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH] nvme: Cleanup nvme_dev_start()
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 <agordeev@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
agordeev@redhat.com


\
 
 \ /
  Last update: 2014-01-20 10:01    [W:0.171 / U:0.544 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site