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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 684FEC54E5D for ; Wed, 13 Mar 2024 02:29:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=MgEbCHjZK3L2DwZkuhUGorM2I8BESR5U9QO85yYYE0Q=; b=M7lfyI6ImhD7Pi69EPJPsILCdz QHjaZQCKcvEH4syjdselIK6WIdIs6KzIY4FroYG5bBA7KWOfEDXTsUYv9Uj3apaeoNthQkzatJxAG mCWwsaf4CChIhIuvZrHpHAP7E9vEQTNf0uNykAw4pAspquD4SLGaE2hH5xr5PB1TPHKgQgBHmN2AT 395tnta1PFFbP2+8i+mJsNBGLDyhBG19Zqsc3idum8jLYKiTyngQ2WNqWd6+fIhreSCZKxbULDYIu eXYpotzWWiF6bfPNGzGJ97lgCyX0Bk3k0dH+akIPQUQxDJMJD80IZ/RihrCucFfdoqhVV7wWXmnt4 Epgvv8og==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rkEMq-00000008Y7j-3QoG; Wed, 13 Mar 2024 02:29:20 +0000 Received: from out30-112.freemail.mail.aliyun.com ([115.124.30.112]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rkEMm-00000008Y6V-3FAP for linux-nvme@lists.infradead.org; Wed, 13 Mar 2024 02:29:19 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1710296952; h=From:To:Subject:Date:Message-ID:MIME-Version; bh=MgEbCHjZK3L2DwZkuhUGorM2I8BESR5U9QO85yYYE0Q=; b=GV0cQXutOgClRf3uThmCnBgDyFdnAVbpKAUOL4fyCAkwzCHUJ11SnxXMouBe9DFKOvv+1qsvcroFMfRSmGCg0PK8jxYritVTeA0890wAKNeM0XpCpFNzJ5tb5gDRNcQwl9tbLMVFkH98yaiD+BwvJ/Ep9eagBxhTQBqwnmzdESU= X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R201e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045170;MF=kanie@linux.alibaba.com;NM=1;PH=DS;RN=5;SR=0;TI=SMTPD_---0W2NKxJb_1710296946; Received: from localhost(mailfrom:kanie@linux.alibaba.com fp:SMTPD_---0W2NKxJb_1710296946) by smtp.aliyun-inc.com; Wed, 13 Mar 2024 10:29:11 +0800 From: Guixin Liu To: kbusch@kernel.org, axboe@kernel.dk, hch@lst.de, sagi@grimberg.me Cc: linux-nvme@lists.infradead.org Subject: [PATCH v2] nvme: use nvme_disk_is_ns_head helper Date: Wed, 13 Mar 2024 10:29:05 +0800 Message-ID: <20240313022905.104092-1-kanie@linux.alibaba.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240312_192917_357264_B389D0D0 X-CRM114-Status: UNSURE ( 9.21 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-nvme@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-nvme" Errors-To: linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org Use nvme_disk_is_ns_head helper instead of check fops directly, and also drop CONFIG_NVME_MULTIPATH check. Signed-off-by: Guixin Liu --- Changes from v1 to v2: - Drop CONFIG_NVME_MULTIPATH check. drivers/nvme/host/pr.c | 3 +-- drivers/nvme/host/sysfs.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/nvme/host/pr.c b/drivers/nvme/host/pr.c index fc3eed00f9ff..e05571b2a1b0 100644 --- a/drivers/nvme/host/pr.c +++ b/drivers/nvme/host/pr.c @@ -97,8 +97,7 @@ static int nvme_sc_to_pr_err(int nvme_sc) static int nvme_send_pr_command(struct block_device *bdev, struct nvme_command *c, void *data, unsigned int data_len) { - if (IS_ENABLED(CONFIG_NVME_MULTIPATH) && - nvme_disk_is_ns_head(bdev->bd_disk)) + if (nvme_disk_is_ns_head(bdev->bd_disk)) return nvme_send_ns_head_pr_command(bdev, c, data, data_len); return nvme_send_ns_pr_command(bdev->bd_disk->private_data, c, data, diff --git a/drivers/nvme/host/sysfs.c b/drivers/nvme/host/sysfs.c index f2832f70e7e0..8b7bf9d943af 100644 --- a/drivers/nvme/host/sysfs.c +++ b/drivers/nvme/host/sysfs.c @@ -239,8 +239,7 @@ static ssize_t nuse_show(struct device *dev, struct device_attribute *attr, struct block_device *bdev = disk->part0; int ret; - if (IS_ENABLED(CONFIG_NVME_MULTIPATH) && - bdev->bd_disk->fops == &nvme_ns_head_ops) + if (nvme_disk_is_ns_head(bdev->bd_disk)) ret = ns_head_update_nuse(head); else ret = ns_update_nuse(bdev->bd_disk->private_data); -- 2.43.0