nvme: use nvme_disk_is_ns_head helper
PATCH v2 1/1 nvme: use nvme_disk_is_ns_head helper
Use nvme_disk_is_ns_head helper instead of check fops directly, and also drop CONFIG_NVME_MULTIPATH check.
Signed-off-by Guixin Liu <[email protected]>
---
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(-)
drivers/nvme/host/pr.c +1 -2
@@ -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,
drivers/nvme/host/sysfs.c +1 -2
@@ -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);
Signature · 1 line
2.43.0
Reviewed-by Sagi Grimberg <[email protected]>
Looks good:
Reviewed-by Christoph Hellwig <[email protected]>
Quoted 2 lines · Guixin Liu
Use
nvme_disk_is_ns_headhelper instead of check fops directly, and also dropCONFIG_NVME_MULTIPATHcheck.
Applied to nvme-6.9, thanks.