Merge tag 'nvme-6.9-2024-03-21' of git://git.infradead.org/nvme into block-6.9

[sfrench/cifs-2.6.git] / drivers / nvme / host / sysfs.c

diff --git a/drivers/nvme/host/sysfs.c b/drivers/nvme/host/sysfs.c
index f2832f70e7e0a861070d066bf1ee71c19fbf5ae2..3c55f7edd181939fc8a37b47e0ce56fdb271e434 100644 (file)
--- a/drivers/nvme/host/sysfs.c
+++ b/drivers/nvme/host/sysfs.c
@@ -221,14 +221,11 @@ static int ns_update_nuse(struct nvme_ns *ns)
 
        ret = nvme_identify_ns(ns->ctrl, ns->head->ns_id, &id);
        if (ret)
-               goto out_free_id;
+               return ret;
 
        ns->head->nuse = le64_to_cpu(id->nuse);
-
-out_free_id:
        kfree(id);
-
-       return ret;
+       return 0;
 }
 
 static ssize_t nuse_show(struct device *dev, struct device_attribute *attr,
@@ -239,8 +236,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);