Dan Williams <dan.j.williams@xxxxxxxxx> writes:
> Rather than update the permission in ->is_visible() set the permission
> directly at declaration time.
>
Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@xxxxxxxxxxxxx>
> Cc: Ira Weiny <ira.weiny@xxxxxxxxx>
> Cc: Vishal Verma <vishal.l.verma@xxxxxxxxx>
> Signed-off-by: Dan Williams <dan.j.williams@xxxxxxxxx>
> ---
> drivers/nvdimm/namespace_devs.c | 9 +++------
> drivers/nvdimm/pfn_devs.c | 10 +---------
> drivers/nvdimm/region_devs.c | 10 +++-------
> 3 files changed, 7 insertions(+), 22 deletions(-)
>
> diff --git a/drivers/nvdimm/namespace_devs.c b/drivers/nvdimm/namespace_devs.c
> index 37471a272c1a..85b553094d19 100644
> --- a/drivers/nvdimm/namespace_devs.c
> +++ b/drivers/nvdimm/namespace_devs.c
> @@ -1303,7 +1303,7 @@ static ssize_t resource_show(struct device *dev,
> return -ENXIO;
> return sprintf(buf, "%#llx\n", (unsigned long long) res->start);
> }
> -static DEVICE_ATTR_RO(resource);
> +static DEVICE_ATTR(resource, 0400, resource_show, NULL);
>
> static const unsigned long blk_lbasize_supported[] = { 512, 520, 528,
> 4096, 4104, 4160, 4224, 0 };
> @@ -1619,11 +1619,8 @@ static umode_t namespace_visible(struct kobject *kobj,
> {
> struct device *dev = container_of(kobj, struct device, kobj);
>
> - if (a == &dev_attr_resource.attr) {
> - if (is_namespace_blk(dev))
> - return 0;
> - return 0400;
> - }
> + if (a == &dev_attr_resource.attr && is_namespace_blk(dev))
> + return 0;
>
> if (is_namespace_pmem(dev) || is_namespace_blk(dev)) {
> if (a == &dev_attr_size.attr)
> diff --git a/drivers/nvdimm/pfn_devs.c b/drivers/nvdimm/pfn_devs.c
> index e809961e2b6f..9f9cb51301e7 100644
> --- a/drivers/nvdimm/pfn_devs.c
> +++ b/drivers/nvdimm/pfn_devs.c
> @@ -218,7 +218,7 @@ static ssize_t resource_show(struct device *dev,
>
> return rc;
> }
> -static DEVICE_ATTR_RO(resource);
> +static DEVICE_ATTR(resource, 0400, resource_show, NULL);
>
> static ssize_t size_show(struct device *dev,
> struct device_attribute *attr, char *buf)
> @@ -269,16 +269,8 @@ static struct attribute *nd_pfn_attributes[] = {
> NULL,
> };
>
> -static umode_t pfn_visible(struct kobject *kobj, struct attribute *a, int n)
> -{
> - if (a == &dev_attr_resource.attr)
> - return 0400;
> - return a->mode;
> -}
> -
> static struct attribute_group nd_pfn_attribute_group = {
> .attrs = nd_pfn_attributes,
> - .is_visible = pfn_visible,
> };
>
> const struct attribute_group *nd_pfn_attribute_groups[] = {
> diff --git a/drivers/nvdimm/region_devs.c b/drivers/nvdimm/region_devs.c
> index 0afc1973e938..be3e429e86af 100644
> --- a/drivers/nvdimm/region_devs.c
> +++ b/drivers/nvdimm/region_devs.c
> @@ -553,7 +553,7 @@ static ssize_t resource_show(struct device *dev,
>
> return sprintf(buf, "%#llx\n", nd_region->ndr_start);
> }
> -static DEVICE_ATTR_RO(resource);
> +static DEVICE_ATTR(resource, 0400, resource_show, NULL);
>
> static ssize_t persistence_domain_show(struct device *dev,
> struct device_attribute *attr, char *buf)
> @@ -605,12 +605,8 @@ static umode_t region_visible(struct kobject *kobj, struct attribute *a, int n)
> if (!is_memory(dev) && a == &dev_attr_badblocks.attr)
> return 0;
>
> - if (a == &dev_attr_resource.attr) {
> - if (is_memory(dev))
> - return 0400;
> - else
> - return 0;
> - }
> + if (a == &dev_attr_resource.attr && !is_memory(dev))
> + return 0;
>
> if (a == &dev_attr_deep_flush.attr) {
> int has_flush = nvdimm_has_flush(nd_region);
> _______________________________________________
> Linux-nvdimm mailing list -- linux-nvdimm@xxxxxxxxxxxx
> To unsubscribe send an email to linux-nvdimm-leave@xxxxxxxxxxxx
