linux-nvme.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: sagi@grimberg.me (Sagi Grimberg)
Subject: [PATCH 3/5] nvme-rdma: remove redundant check if the ctrl is in the ctrl when freeing it
Date: Wed, 18 Oct 2017 14:07:42 +0300	[thread overview]
Message-ID: <1508324864-23087-4-git-send-email-sagi@grimberg.me> (raw)
In-Reply-To: <1508324864-23087-1-git-send-email-sagi@grimberg.me>

From: Roy Shterman <roys@lightbitslabs.com>

Its no longer acceptable now that we do not invoke ->free_ctrl
from inside ->create_ctrl.

Signed-off-by: Roy Shterman <roys at lightbitslabs.com>
Signed-off-by: Sagi Grimberg <sagi at grimberg.me>
---
 drivers/nvme/host/rdma.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
index 866abee2374d..03a3f0372450 100644
--- a/drivers/nvme/host/rdma.c
+++ b/drivers/nvme/host/rdma.c
@@ -875,16 +875,12 @@ static void nvme_rdma_free_ctrl(struct nvme_ctrl *nctrl)
 {
 	struct nvme_rdma_ctrl *ctrl = to_rdma_ctrl(nctrl);
 
-	if (list_empty(&ctrl->list))
-		goto free_ctrl;
-
 	mutex_lock(&nvme_rdma_ctrl_mutex);
 	list_del(&ctrl->list);
 	mutex_unlock(&nvme_rdma_ctrl_mutex);
 
 	kfree(ctrl->queues);
 	nvmf_free_options(nctrl->opts);
-free_ctrl:
 	kfree(ctrl);
 }
 
-- 
2.7.4

  parent reply	other threads:[~2017-10-18 11:07 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-18 11:07 [PATCH 0/5] Small rework of nvme_init/uninit_ctrl Sagi Grimberg
2017-10-18 11:07 ` [PATCH 1/5] nvme-core: Make nvme_init/uninit_ctrl setup/teardown symmetric Sagi Grimberg
2017-10-18 15:08   ` Keith Busch
2017-10-18 15:29     ` Sagi Grimberg
2017-10-18 16:21       ` Keith Busch
2017-10-18 20:17       ` Keith Busch
2017-10-19 15:19         ` Sagi Grimberg
2017-10-19 15:29   ` Christoph Hellwig
2017-10-19 15:31     ` Sagi Grimberg
2017-10-22 11:11       ` Sagi Grimberg
2017-10-23 14:31         ` Christoph Hellwig
2017-10-18 11:07 ` [PATCH 2/5] nvme-rdma: rework create_ctrl error flow Sagi Grimberg
2017-10-23 14:32   ` Christoph Hellwig
2017-10-23 15:25     ` Sagi Grimberg
2017-10-18 11:07 ` Sagi Grimberg [this message]
2017-10-18 11:07 ` [PATCH 4/5] nvme-loop: " Sagi Grimberg
2017-10-18 11:07 ` [PATCH 5/5] nvme-loop: remove redundant check if the ctrl is in the ctrl when freeing it 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=1508324864-23087-4-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).