libnvdimm: Simplify root read-only definition for the 'resource' attribute
Rather than update the permission in ->is_visible() set the permission directly at declaration time. Cc: Ira Weiny <ira.weiny@intel.com> Cc: Vishal Verma <vishal.l.verma@intel.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com> Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com> Link: https://lore.kernel.org/r/157309905534.1582359.13927459228885931097.stgit@dwillia2-desk3.amr.corp.intel.com
This commit is contained in:
@@ -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)
|
||||
|
Reference in New Issue
Block a user