diff options
| author | Mike Snitzer <snitzer@redhat.com> | 2018-01-09 20:46:49 -0500 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-01-15 08:41:38 -0700 |
| commit | bc8d062c36e3525e81ea8237ff0ab3264c2317b6 (patch) | |
| tree | 9385753a2d290add6cad65051d08db5ed5223e2c | |
| parent | bf9ae8c5325c0070d0ec81a849bba8d156f65993 (diff) | |
| download | op-kernel-dev-bc8d062c36e3525e81ea8237ff0ab3264c2317b6.zip op-kernel-dev-bc8d062c36e3525e81ea8237ff0ab3264c2317b6.tar.gz | |
block: only bdi_unregister() in del_gendisk() if !GENHD_FL_HIDDEN
device_add_disk() will only call bdi_register_owner() if
!GENHD_FL_HIDDEN, so it follows that del_gendisk() should only call
bdi_unregister() if !GENHD_FL_HIDDEN.
Found with code inspection. bdi_unregister() won't do any harm if
bdi_register_owner() wasn't used but best to avoid the unnecessary
call to bdi_unregister().
Fixes: 8ddcd65325 ("block: introduce GENHD_FL_HIDDEN")
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
| -rw-r--r-- | block/genhd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/block/genhd.c b/block/genhd.c index 96a66f6..00620e0 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -725,7 +725,8 @@ void del_gendisk(struct gendisk *disk) * Unregister bdi before releasing device numbers (as they can * get reused and we'd get clashes in sysfs). */ - bdi_unregister(disk->queue->backing_dev_info); + if (!(disk->flags & GENHD_FL_HIDDEN)) + bdi_unregister(disk->queue->backing_dev_info); blk_unregister_queue(disk); } else { WARN_ON(1); |
