From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 71253C31E5C for ; Mon, 17 Jun 2019 21:21:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3AD0220652 for ; Mon, 17 Jun 2019 21:21:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560806484; bh=LrKsTihjQHV9cAQ8nPfhHje9OKoxZbhk79uJdJxwCoo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Uss+uRrk0OoJNdmpc0Q2A0MpzvnydZ0WUnmtlLtxujEuIrYpKHuSdnDrqE5wD/yve dJ1S5TAQEY/mNpYqeTUN0l9oEcPBmhwFY7h4F+30hboy1OWrRGKl3OpDz4u8keffFn CJ3sZfaAQIoTbVjWuWu+UbWrCgfQ9oepVKWqfCuQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729342AbfFQVVX (ORCPT ); Mon, 17 Jun 2019 17:21:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:45910 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726427AbfFQVVW (ORCPT ); Mon, 17 Jun 2019 17:21:22 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C912E20652; Mon, 17 Jun 2019 21:21:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560806482; bh=LrKsTihjQHV9cAQ8nPfhHje9OKoxZbhk79uJdJxwCoo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iIDs7Tyqq78tV34gMYfakJUnYP2iMCJLSisGOMxH184mq322CD9J9x162SLHAC4Is Q68zqEFy2CPQHzzfA3cWhx5Yo842UBtqlc5znMvquLnzMX9SeNQgFQKm/iOtKI72AV zfHZTQmaq35EO9GHYYRWdrmmAiAQdzsli7ut7RL0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christoph Hellwig , Keith Busch , Chaitanya Kulkarni , Sasha Levin Subject: [PATCH 5.1 067/115] nvme: remove the ifdef around nvme_nvm_ioctl Date: Mon, 17 Jun 2019 23:09:27 +0200 Message-Id: <20190617210803.556722878@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190617210759.929316339@linuxfoundation.org> References: <20190617210759.929316339@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit 3f98bcc58cd5f1e4668db289dcab771874cc0920 ] We already have a proper stub if lightnvm is not enabled, so don't bother with the ifdef. Signed-off-by: Christoph Hellwig Reviewed-by: Keith Busch Reviewed-by: Chaitanya Kulkarni Signed-off-by: Sasha Levin --- 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 e29c395f44d2..decc0b3a3854 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -1396,10 +1396,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