Commit 3f98bcc5 authored May 17, 2019 by Christoph Hellwig Committed by Keith Busch May 17, 2019

nvme: remove the ifdef around nvme_nvm_ioctl



We already have a proper stub if lightnvm is not enabled, so don't bother
with the ifdef.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Keith Busch <keith.busch@intel.com>
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>

parent 100c815c

drivers/nvme/host/core.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -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);

Admin message