nvdimm/namespace: Delete blk namespace consideration in shared paths

Given is_namespace_blk() is never true outside of the NVDIMM unit tests
delete the support from namespace device management.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/164688417214.2879318.4698377272678028573.stgit@dwillia2-desk3.amr.corp.intel.com
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

diff --git a/drivers/nvdimm/namespace_devs.c b/drivers/nvdimm/namespace_devs.c
index b57a2d36c517a2cba62b8d0ba3d2e311d4ab1d59..5c76547c9b849294afe7700fa869e433ab453feb 100644 (file)
--- a/drivers/nvdimm/namespace_devs.c
+++ b/drivers/nvdimm/namespace_devs.c
@@ -46,7 +46,6 @@ static void namespace_blk_release(struct device *dev)
 }
 
 static bool is_namespace_pmem(const struct device *dev);
-static bool is_namespace_blk(const struct device *dev);
 static bool is_namespace_io(const struct device *dev);
 
 static int is_uuid_busy(struct device *dev, void *data)
@@ -57,10 +56,6 @@ static int is_uuid_busy(struct device *dev, void *data)
                struct nd_namespace_pmem *nspm = to_nd_namespace_pmem(dev);
 
                uuid2 = nspm->uuid;
-       } else if (is_namespace_blk(dev)) {
-               struct nd_namespace_blk *nsblk = to_nd_namespace_blk(dev);
-
-               uuid2 = nsblk->uuid;
        } else if (is_nd_btt(dev)) {
                struct nd_btt *nd_btt = to_nd_btt(dev);
 
@@ -178,12 +173,6 @@ const char *nvdimm_namespace_disk_name(struct nd_namespace_common *ndns,
                else
                        sprintf(name, "pmem%d%s", nd_region->id,
                                        suffix ? suffix : "");
-       } else if (is_namespace_blk(&ndns->dev)) {
-               struct nd_namespace_blk *nsblk;
-
-               nsblk = to_nd_namespace_blk(&ndns->dev);
-               sprintf(name, "ndblk%d.%d%s", nd_region->id, nsblk->id,
-                               suffix ? suffix : "");
        } else {
                return NULL;
        }
@@ -201,10 +190,6 @@ const uuid_t *nd_dev_to_uuid(struct device *dev)
                struct nd_namespace_pmem *nspm = to_nd_namespace_pmem(dev);
 
                return nspm->uuid;
-       } else if (is_namespace_blk(dev)) {
-               struct nd_namespace_blk *nsblk = to_nd_namespace_blk(dev);
-
-               return nsblk->uuid;
        } else
                return &uuid_null;
 }
@@ -229,10 +214,6 @@ static ssize_t __alt_name_store(struct device *dev, const char *buf,
                struct nd_namespace_pmem *nspm = to_nd_namespace_pmem(dev);
 
                ns_altname = &nspm->alt_name;
-       } else if (is_namespace_blk(dev)) {
-               struct nd_namespace_blk *nsblk = to_nd_namespace_blk(dev);
-
-               ns_altname = &nsblk->alt_name;
        } else
                return -ENXIO;
 
@@ -264,24 +245,6 @@ out:
        return rc;
 }
 
-static resource_size_t nd_namespace_blk_size(struct nd_namespace_blk *nsblk)
-{
-       struct nd_region *nd_region = to_nd_region(nsblk->common.dev.parent);
-       struct nd_mapping *nd_mapping = &nd_region->mapping[0];
-       struct nvdimm_drvdata *ndd = to_ndd(nd_mapping);
-       struct nd_label_id label_id;
-       resource_size_t size = 0;
-       struct resource *res;
-
-       if (!nsblk->uuid)
-               return 0;
-       nd_label_gen_id(&label_id, nsblk->uuid, NSLABEL_FLAG_LOCAL);
-       for_each_dpa_resource(ndd, res)
-               if (strcmp(res->name, label_id.id) == 0)
-                       size += resource_size(res);
-       return size;
-}
-
 static bool __nd_namespace_blk_validate(struct nd_namespace_blk *nsblk)
 {
        struct nd_region *nd_region = to_nd_region(nsblk->common.dev.parent);
@@ -363,16 +326,6 @@ static int nd_namespace_label_update(struct nd_region *nd_region,
                        return 0;
 
                return nd_pmem_namespace_label_update(nd_region, nspm, size);
-       } else if (is_namespace_blk(dev)) {
-               struct nd_namespace_blk *nsblk = to_nd_namespace_blk(dev);
-               resource_size_t size = nd_namespace_blk_size(nsblk);
-
-               if (size == 0 && nsblk->uuid)
-                       /* delete allocation */;
-               else if (!nsblk->uuid || !nsblk->lbasize)
-                       return 0;
-
-               return nd_blk_namespace_label_update(nd_region, nsblk, size);
        } else
                return -ENXIO;
 }
@@ -405,10 +358,6 @@ static ssize_t alt_name_show(struct device *dev,
                struct nd_namespace_pmem *nspm = to_nd_namespace_pmem(dev);
 
                ns_altname = nspm->alt_name;
-       } else if (is_namespace_blk(dev)) {
-               struct nd_namespace_blk *nsblk = to_nd_namespace_blk(dev);
-
-               ns_altname = nsblk->alt_name;
        } else
                return -ENXIO;
 
@@ -966,12 +915,6 @@ static ssize_t __size_store(struct device *dev, unsigned long long val)
 
                uuid = nspm->uuid;
                id = nspm->id;
-       } else if (is_namespace_blk(dev)) {
-               struct nd_namespace_blk *nsblk = to_nd_namespace_blk(dev);
-
-               uuid = nsblk->uuid;
-               flags = NSLABEL_FLAG_LOCAL;
-               id = nsblk->id;
        }
 
        /*
@@ -1067,10 +1010,6 @@ static ssize_t size_store(struct device *dev,
                struct nd_namespace_pmem *nspm = to_nd_namespace_pmem(dev);
 
                uuid = &nspm->uuid;
-       } else if (is_namespace_blk(dev)) {
-               struct nd_namespace_blk *nsblk = to_nd_namespace_blk(dev);
-
-               uuid = &nsblk->uuid;
        }
 
        if (rc == 0 && val == 0 && uuid) {
@@ -1095,8 +1034,6 @@ resource_size_t __nvdimm_namespace_capacity(struct nd_namespace_common *ndns)
                struct nd_namespace_pmem *nspm = to_nd_namespace_pmem(dev);
 
                return resource_size(&nspm->nsio.res);
-       } else if (is_namespace_blk(dev)) {
-               return nd_namespace_blk_size(to_nd_namespace_blk(dev));
        } else if (is_namespace_io(dev)) {
                struct nd_namespace_io *nsio = to_nd_namespace_io(dev);
 
@@ -1152,12 +1089,8 @@ static uuid_t *namespace_to_uuid(struct device *dev)
                struct nd_namespace_pmem *nspm = to_nd_namespace_pmem(dev);
 
                return nspm->uuid;
-       } else if (is_namespace_blk(dev)) {
-               struct nd_namespace_blk *nsblk = to_nd_namespace_blk(dev);
-
-               return nsblk->uuid;
-       } else
-               return ERR_PTR(-ENXIO);
+       }
+       return ERR_PTR(-ENXIO);
 }
 
 static ssize_t uuid_show(struct device *dev, struct device_attribute *attr,
@@ -1183,7 +1116,6 @@ static int namespace_update_uuid(struct nd_region *nd_region,
                                 struct device *dev, uuid_t *new_uuid,
                                 uuid_t **old_uuid)
 {
-       u32 flags = is_namespace_blk(dev) ? NSLABEL_FLAG_LOCAL : 0;
        struct nd_label_id old_label_id;
        struct nd_label_id new_label_id;
        int i;
@@ -1214,8 +1146,8 @@ static int namespace_update_uuid(struct nd_region *nd_region,
                        return -EBUSY;
        }
 
-       nd_label_gen_id(&old_label_id, *old_uuid, flags);
-       nd_label_gen_id(&new_label_id, new_uuid, flags);
+       nd_label_gen_id(&old_label_id, *old_uuid, 0);
+       nd_label_gen_id(&new_label_id, new_uuid, 0);
        for (i = 0; i < nd_region->ndr_mappings; i++) {
                struct nd_mapping *nd_mapping = &nd_region->mapping[i];
                struct nvdimm_drvdata *ndd = to_ndd(nd_mapping);
@@ -1261,10 +1193,6 @@ static ssize_t uuid_store(struct device *dev,
                struct nd_namespace_pmem *nspm = to_nd_namespace_pmem(dev);
 
                ns_uuid = &nspm->uuid;
-       } else if (is_namespace_blk(dev)) {
-               struct nd_namespace_blk *nsblk = to_nd_namespace_blk(dev);
-
-               ns_uuid = &nsblk->uuid;
        } else
                return -ENXIO;
 
@@ -1321,13 +1249,6 @@ static const unsigned long pmem_lbasize_supported[] = { 512, 4096, 0 };
 static ssize_t sector_size_show(struct device *dev,
                struct device_attribute *attr, char *buf)
 {
-       if (is_namespace_blk(dev)) {
-               struct nd_namespace_blk *nsblk = to_nd_namespace_blk(dev);
-
-               return nd_size_select_show(nsblk->lbasize,
-                               blk_lbasize_supported, buf);
-       }
-
        if (is_namespace_pmem(dev)) {
                struct nd_namespace_pmem *nspm = to_nd_namespace_pmem(dev);
 
@@ -1345,12 +1266,7 @@ static ssize_t sector_size_store(struct device *dev,
        unsigned long *lbasize;
        ssize_t rc = 0;
 
-       if (is_namespace_blk(dev)) {
-               struct nd_namespace_blk *nsblk = to_nd_namespace_blk(dev);
-
-               lbasize = &nsblk->lbasize;
-               supported = blk_lbasize_supported;
-       } else if (is_namespace_pmem(dev)) {
+       if (is_namespace_pmem(dev)) {
                struct nd_namespace_pmem *nspm = to_nd_namespace_pmem(dev);
 
                lbasize = &nspm->lbasize;
@@ -1390,11 +1306,6 @@ static ssize_t dpa_extents_show(struct device *dev,
 
                uuid = nspm->uuid;
                flags = 0;
-       } else if (is_namespace_blk(dev)) {
-               struct nd_namespace_blk *nsblk = to_nd_namespace_blk(dev);
-
-               uuid = nsblk->uuid;
-               flags = NSLABEL_FLAG_LOCAL;
        }
 
        if (!uuid)
@@ -1627,10 +1538,7 @@ static umode_t namespace_visible(struct kobject *kobj,
 {
        struct device *dev = container_of(kobj, struct device, kobj);
 
-       if (a == &dev_attr_resource.attr && is_namespace_blk(dev))
-               return 0;
-
-       if (is_namespace_pmem(dev) || is_namespace_blk(dev)) {
+       if (is_namespace_pmem(dev)) {
                if (a == &dev_attr_size.attr)
                        return 0644;
 
@@ -1682,11 +1590,6 @@ static bool is_namespace_pmem(const struct device *dev)
        return dev ? dev->type == &namespace_pmem_device_type : false;
 }
 
-static bool is_namespace_blk(const struct device *dev)
-{
-       return dev ? dev->type == &namespace_blk_device_type : false;
-}
-
 static bool is_namespace_io(const struct device *dev)
 {
        return dev ? dev->type == &namespace_io_device_type : false;
@@ -1769,18 +1672,6 @@ struct nd_namespace_common *nvdimm_namespace_common_probe(struct device *dev)
                nspm = to_nd_namespace_pmem(&ndns->dev);
                if (uuid_not_set(nspm->uuid, &ndns->dev, __func__))
                        return ERR_PTR(-ENODEV);
-       } else if (is_namespace_blk(&ndns->dev)) {
-               struct nd_namespace_blk *nsblk;
-
-               nsblk = to_nd_namespace_blk(&ndns->dev);
-               if (uuid_not_set(nsblk->uuid, &ndns->dev, __func__))
-                       return ERR_PTR(-ENODEV);
-               if (!nsblk->lbasize) {
-                       dev_dbg(&ndns->dev, "sector size not set\n");
-                       return ERR_PTR(-ENODEV);
-               }
-               if (!nd_namespace_blk_validate(nsblk))
-                       return ERR_PTR(-ENODEV);
        }
 
        return ndns;
@@ -1790,16 +1681,12 @@ EXPORT_SYMBOL(nvdimm_namespace_common_probe);
 int devm_namespace_enable(struct device *dev, struct nd_namespace_common *ndns,
                resource_size_t size)
 {
-       if (is_namespace_blk(&ndns->dev))
-               return 0;
        return devm_nsio_enable(dev, to_nd_namespace_io(&ndns->dev), size);
 }
 EXPORT_SYMBOL_GPL(devm_namespace_enable);
 
 void devm_namespace_disable(struct device *dev, struct nd_namespace_common *ndns)
 {
-       if (is_namespace_blk(&ndns->dev))
-               return;
        devm_nsio_disable(dev, to_nd_namespace_io(&ndns->dev));
 }
 EXPORT_SYMBOL_GPL(devm_namespace_disable);
@@ -2225,7 +2112,6 @@ static int add_namespace_resource(struct nd_region *nd_region,
 
        for (i = 0; i < count; i++) {
                uuid_t *uuid = namespace_to_uuid(devs[i]);
-               struct resource *res;
 
                if (IS_ERR(uuid)) {
                        WARN_ON(1);
@@ -2234,20 +2120,9 @@ static int add_namespace_resource(struct nd_region *nd_region,
 
                if (!nsl_uuid_equal(ndd, nd_label, uuid))
                        continue;
-               if (is_namespace_blk(devs[i])) {
-                       res = nsblk_add_resource(nd_region, ndd,
-                                       to_nd_namespace_blk(devs[i]),
-                                       nsl_get_dpa(ndd, nd_label));
-                       if (!res)
-                               return -ENXIO;
-                       nd_dbg_dpa(nd_region, ndd, res, "%d assign\n", count);
-               } else {
-                       dev_err(&nd_region->dev,
-                               "error: conflicting extents for uuid: %pUb\n",
-                               uuid);
-                       return -ENXIO;
-               }
-               break;
+               dev_err(&nd_region->dev,
+                       "error: conflicting extents for uuid: %pUb\n", uuid);
+               return -ENXIO;
        }
 
        return i;
@@ -2305,20 +2180,11 @@ static int cmp_dpa(const void *a, const void *b)
 {
        const struct device *dev_a = *(const struct device **) a;
        const struct device *dev_b = *(const struct device **) b;
-       struct nd_namespace_blk *nsblk_a, *nsblk_b;
        struct nd_namespace_pmem *nspm_a, *nspm_b;
 
        if (is_namespace_io(dev_a))
                return 0;
 
-       if (is_namespace_blk(dev_a)) {
-               nsblk_a = to_nd_namespace_blk(dev_a);
-               nsblk_b = to_nd_namespace_blk(dev_b);
-
-               return memcmp(&nsblk_a->res[0]->start, &nsblk_b->res[0]->start,
-                               sizeof(resource_size_t));
-       }
-
        nspm_a = to_nd_namespace_pmem(dev_a);
        nspm_b = to_nd_namespace_pmem(dev_b);