block: Don't revalidate bdev of hidden gendisk
Subsystems (2)
Jan Kara
reviewerPATCH 1/1 block: Don't revalidate bdev of hidden gendisk
When hidden gendisk is revalidated, there's no point in revalidating associated block device as there's none. We would thus just create new bdev inode, report "detected capacity change from 0 to XXX" message and evict the bdev inode again. Avoid this pointless dance and confusing message in the kernel log.
--- fs/block_dev.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-)
fs/block_dev.c +16 -9
@@ -1405,20 +1405,27 @@ void check_disk_size_change(struct gendisk *disk, struct block_device *bdev,*/ int revalidate_disk (struct gendisk *disk) { -struct block_device *bdev;int ret =0 ;if (disk->fops->revalidate_disk) ret = disk->fops->revalidate_disk (disk); - bdev =bdget_disk (disk,0 ); -if (!bdev) -return ret; -mutex_lock (&bdev->bd_mutex); -check_disk_size_change (disk, bdev, ret ==0 ); - bdev->bd_invalidated =0 ; -mutex_unlock (&bdev->bd_mutex); -bdput (bdev); +/* +* Hidden disks don't have associated bdev so there's no point in +* revalidating it. +*/ +if (!(disk->flags &GENHD_FL_HIDDEN )) { +struct block_device *bdev =bdget_disk (disk,0 ); + +if (!bdev) +return ret; + +mutex_lock (&bdev->bd_mutex); +check_disk_size_change (disk, bdev, ret ==0 ); + bdev->bd_invalidated =0 ; +mutex_unlock (&bdev->bd_mutex); +bdput (bdev); + }return ret; }EXPORT_SYMBOL (revalidate_disk);
Signature · 1 line
2.16.4
Quoted 11 lines · Jan Kara
When hidden gendisk is revalidated, there's no point in revalidating associated block device as there's none. We would thus just create new bdev inode, report "detected capacity change from 0 to XXX" message and evict the bdev inode again. Avoid this pointless dance and confusing message in the kernel log.
Signed-off-by Jan Kara <[email protected]>--- fs/block_dev.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-)
Cheers,
Hannes
Signature · 5 lines
Dr. Hannes Reinecke Teamlead Storage & Networking [email protected] +49 911 74053 688 SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg GF: Felix Imendörffer, Mary Higgins, Sri Rasiah HRB 21284 (AG Nürnberg)
Quoted 5 lines · Jan Kara
When hidden gendisk is revalidated, there's no point in revalidating associated block device as there's none. We would thus just create new bdev inode, report "detected capacity change from 0 to XXX" message and evict the bdev inode again. Avoid this pointless dance and confusing message in the kernel log.
Personally I'd do an early return instead of the indent, but functionally this looks fine:
Jan Kara
reviewerQuoted 7 lines · Jan Kara
When hidden gendisk is revalidated, there's no point in revalidating associated block device as there's none. We would thus just create new bdev inode, report "detected capacity change from 0 to XXX" message and evict the bdev inode again. Avoid this pointless dance and confusing message in the kernel log.
Signed-off-by Jan Kara <[email protected]>
Jens, ping?
Honza
Quoted 48 lines
--- fs/block_dev.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-)fs/block_dev.c +16
-9@@ -1405,20 +1405,27 @@ void check_disk_size_change(struct gendisk *disk, struct block_device *bdev,*/ int revalidate_disk (struct gendisk *disk) { -struct block_device *bdev;int ret =0 ;if (disk->fops->revalidate_disk) ret = disk->fops->revalidate_disk (disk); - bdev =bdget_disk (disk,0 ); -if (!bdev) -return ret; -mutex_lock (&bdev->bd_mutex); -check_disk_size_change (disk, bdev, ret ==0 ); - bdev->bd_invalidated =0 ; -mutex_unlock (&bdev->bd_mutex); -bdput (bdev); +/* +* Hidden disks don't have associated bdev so there's no point in +* revalidating it. +*/ +if (!(disk->flags &GENHD_FL_HIDDEN )) { +struct block_device *bdev =bdget_disk (disk,0 ); + +if (!bdev) +return ret; + +mutex_lock (&bdev->bd_mutex); +check_disk_size_change (disk, bdev, ret ==0 ); + bdev->bd_invalidated =0 ; +mutex_unlock (&bdev->bd_mutex); +bdput (bdev); + }return ret; }EXPORT_SYMBOL (revalidate_disk);Signature · 1 line
2.16.4
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Quoted 5 lines · Jan Kara
When hidden gendisk is revalidated, there's no point in revalidating associated block device as there's none. We would thus just create new bdev inode, report "detected capacity change from 0 to XXX" message and evict the bdev inode again. Avoid this pointless dance and confusing message in the kernel log.
Applied, thanks.
Signature · 1 line
Jens Axboe