From: hch@lst.de (Christoph Hellwig)
Subject: [PATCH 2/4] nvme: remove the ifdef around nvme_nvm_ioctl
Date: Thu, 16 May 2019 20:50:34 +0200 [thread overview]
Message-ID: <20190516185036.17394-2-hch@lst.de> (raw)
In-Reply-To: <20190516185036.17394-1-hch@lst.de>
We already have a proper stub if lightnvm is not enabled, so don't bother
with the ifdef.
Signed-off-by: Christoph Hellwig <hch at lst.de>
---
drivers/nvme/host/core.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index eb1c2c349014..7f72d57efc27 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1395,10 +1395,8 @@ static int nvme_ns_ioctl(struct nvme_ns *ns, unsigned cmd, unsigned long arg)
case NVME_IOCTL_SUBMIT_IO:
return nvme_submit_io(ns, (void __user *)arg);
default:
-#ifdef CONFIG_NVM
if (ns->ndev)
return nvme_nvm_ioctl(ns, cmd, arg);
-#endif
if (is_sed_ioctl(cmd))
return sed_ioctl(ns->ctrl->opal_dev, cmd,
(void __user *) arg);
--
2.20.1
next prev parent reply other threads:[~2019-05-16 18:50 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-16 18:50 [PATCH 1/4] nvme: fix srcu locking on error return in nvme_get_ns_from_disk Christoph Hellwig
2019-05-16 18:50 ` Christoph Hellwig [this message]
2019-05-16 19:01 ` [PATCH 2/4] nvme: remove the ifdef around nvme_nvm_ioctl Keith Busch
2019-05-16 22:33 ` Chaitanya Kulkarni
2019-05-16 18:50 ` [PATCH 3/4] nvme: merge nvme_ns_ioctl into nvme_ioctl Christoph Hellwig
2019-05-16 19:02 ` Keith Busch
2019-05-16 22:40 ` Chaitanya Kulkarni
2019-05-16 18:50 ` [PATCH 4/4] nvme: release namespace SRCU protection before performing controller ioctls Christoph Hellwig
2019-05-16 19:05 ` Keith Busch
2019-05-16 22:57 ` Chaitanya Kulkarni
2019-05-16 19:01 ` [PATCH 1/4] nvme: fix srcu locking on error return in nvme_get_ns_from_disk Keith Busch
2019-05-16 22:33 ` Chaitanya Kulkarni
-- strict thread matches above, loose matches on Subject: below --
2019-05-17 9:47 Christoph Hellwig
2019-05-17 9:47 ` [PATCH 2/4] nvme: remove the ifdef around nvme_nvm_ioctl Christoph Hellwig
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=20190516185036.17394-2-hch@lst.de \
--to=hch@lst.de \
/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