From: sagi@grimberg.me (Sagi Grimberg)
Subject: [PATCH 4/5] nvme-rdma: Remove duplicate call to nvme_remove_namespaces
Date: Fri, 29 Jul 2016 22:57:21 +0300 [thread overview]
Message-ID: <1469822242-3477-5-git-send-email-sagi@grimberg.me> (raw)
In-Reply-To: <1469822242-3477-1-git-send-email-sagi@grimberg.me>
nvme_uninit_ctrl already does that for us.
Signed-off-by: Sagi Grimberg <sagi at grimberg.me>
---
drivers/nvme/host/rdma.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
index 641ab7f91899..bd9b416fe21a 100644
--- a/drivers/nvme/host/rdma.c
+++ b/drivers/nvme/host/rdma.c
@@ -1658,9 +1658,8 @@ static void nvme_rdma_del_ctrl_work(struct work_struct *work)
struct nvme_rdma_ctrl *ctrl = container_of(work,
struct nvme_rdma_ctrl, delete_work);
- nvme_remove_namespaces(&ctrl->ctrl);
- nvme_rdma_shutdown_ctrl(ctrl);
nvme_uninit_ctrl(&ctrl->ctrl);
+ nvme_rdma_shutdown_ctrl(ctrl);
if (ctrl->ctrl.tagset) {
blk_cleanup_queue(ctrl->ctrl.connect_q);
blk_mq_free_tag_set(&ctrl->tag_set);
@@ -1699,7 +1698,6 @@ static void nvme_rdma_remove_ctrl_work(struct work_struct *work)
struct nvme_rdma_ctrl *ctrl = container_of(work,
struct nvme_rdma_ctrl, delete_work);
- nvme_remove_namespaces(&ctrl->ctrl);
nvme_uninit_ctrl(&ctrl->ctrl);
if (ctrl->ctrl.tagset) {
blk_cleanup_queue(ctrl->ctrl.connect_q);
--
1.9.1
next prev parent reply other threads:[~2016-07-29 19:57 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-29 19:57 [PATCH 0/5] Some fabrics fixes Sagi Grimberg
2016-07-29 19:57 ` [PATCH 1/5] nvme-rdma: Fix device removal handling Sagi Grimberg
2016-08-01 11:00 ` Christoph Hellwig
2016-07-29 19:57 ` [PATCH 2/5] nvme-rdma: Free the I/O tags when we delete the controller Sagi Grimberg
2016-08-01 11:03 ` Christoph Hellwig
2016-08-01 11:15 ` Sagi Grimberg
2016-08-01 15:47 ` Christoph Hellwig
2016-08-02 6:14 ` Sagi Grimberg
2016-07-29 19:57 ` [PATCH 3/5] nvme-rdma: Make sure to shutdown the controller if we can Sagi Grimberg
2016-08-01 11:04 ` Christoph Hellwig
2016-08-01 11:17 ` Sagi Grimberg
2016-08-01 15:48 ` Christoph Hellwig
2016-08-02 6:19 ` Sagi Grimberg
2016-08-02 12:52 ` Christoph Hellwig
2016-08-02 13:26 ` Sagi Grimberg
2016-07-29 19:57 ` Sagi Grimberg [this message]
2016-08-01 11:06 ` [PATCH 4/5] nvme-rdma: Remove duplicate call to nvme_remove_namespaces Christoph Hellwig
2016-08-01 11:21 ` Sagi Grimberg
2016-07-29 19:57 ` [PATCH 5/5] nvme-loop: " Sagi Grimberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1469822242-3477-5-git-send-email-sagi@grimberg.me \
--to=sagi@grimberg.me \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).