diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2017-04-27 23:46:26 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-04-28 16:26:42 +0200 |
| commit | 9438b3e080beccf6022138ea62192d55cc7dc4ed (patch) | |
| tree | 4586260c54677fd672f9fe438d43a85ba5d98000 /block | |
| parent | blk-mq: unify hctx delay_work and run_work (diff) | |
| download | linux-9438b3e080beccf6022138ea62192d55cc7dc4ed.tar.xz linux-9438b3e080beccf6022138ea62192d55cc7dc4ed.zip | |
block: hide badblocks attribute by default
Commit 99e6608c9e74 "block: Add badblock management for gendisks"
allowed for drivers like pmem and software-raid to advertise a list of
bad media areas. However, it inadvertently added a 'badblocks' to all
block devices. Lets clean this up by having the 'badblocks' attribute
not be visible when the driver has not populated a 'struct badblocks'
instance in the gendisk.
Cc: Jens Axboe <axboe@fb.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Martin K. Petersen <martin.petersen@oracle.com>
Reported-by: Vishal Verma <vishal.l.verma@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Tested-by: Vishal Verma <vishal.l.verma@intel.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/genhd.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/block/genhd.c b/block/genhd.c index 510aac1486cb..9a2d01abfa3b 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -1060,8 +1060,19 @@ static struct attribute *disk_attrs[] = { NULL }; +static umode_t disk_visible(struct kobject *kobj, struct attribute *a, int n) +{ + struct device *dev = container_of(kobj, typeof(*dev), kobj); + struct gendisk *disk = dev_to_disk(dev); + + if (a == &dev_attr_badblocks.attr && !disk->bb) + return 0; + return a->mode; +} + static struct attribute_group disk_attr_group = { .attrs = disk_attrs, + .is_visible = disk_visible, }; static const struct attribute_group *disk_attr_groups[] = { |