pending-5.1/nvme-remove-the-ifdef-around-nvme_nvm_ioctl.patch

   1 From fad0c55be6b10fbe6b8ad9de9dd4062e8d6be137 Mon Sep 17 00:00:00 2001
   2 From: Christoph Hellwig <hch@lst.de>
   3 Date: Fri, 17 May 2019 02:47:34 -0700
   4 Subject: nvme: remove the ifdef around nvme_nvm_ioctl
   5
   6 [ Upstream commit 3f98bcc58cd5f1e4668db289dcab771874cc0920 ]
   7
   8 We already have a proper stub if lightnvm is not enabled, so don't bother
   9 with the ifdef.
  10
  11 Signed-off-by: Christoph Hellwig <hch@lst.de>
  12 Reviewed-by: Keith Busch <keith.busch@intel.com>
  13 Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
  14 Signed-off-by: Sasha Levin <sashal@kernel.org>
  15 ---
  16  drivers/nvme/host/core.c | 2 --
  17  1 file changed, 2 deletions(-)
  18
  19 diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
  20 index e29c395f44d2..decc0b3a3854 100644
  21 --- a/drivers/nvme/host/core.c
  22 +++ b/drivers/nvme/host/core.c
  23 @@ -1396,10 +1396,8 @@ static int nvme_ns_ioctl(struct nvme_ns *ns, unsigned cmd, unsigned long arg)
  24         case NVME_IOCTL_SUBMIT_IO:
  25                 return nvme_submit_io(ns, (void __user *)arg);
  26         default:
  27 -#ifdef CONFIG_NVM
  28                 if (ns->ndev)
  29                         return nvme_nvm_ioctl(ns, cmd, arg);
  30 -#endif
  31                 if (is_sed_ioctl(cmd))
  32                         return sed_ioctl(ns->ctrl->opal_dev, cmd,
  33                                          (void __user *) arg);
  34 --
  35 2.20.1
  36