On Thu 26-11-20 14:04:18, Christoph Hellwig wrote:
> Pass the block_device actually needed instead of looking it up using
> bdget_disk.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Looks good. You can add:
Reviewed-by: Jan Kara <jack@xxxxxxx>
Honza
> ---
> block/genhd.c | 13 +++----------
> 1 file changed, 3 insertions(+), 10 deletions(-)
>
> diff --git a/block/genhd.c b/block/genhd.c
> index 89cd0ba8e3b84a..28299b24173be1 100644
> --- a/block/genhd.c
> +++ b/block/genhd.c
> @@ -792,14 +792,8 @@ void device_add_disk_no_queue_reg(struct device *parent, struct gendisk *disk)
> }
> EXPORT_SYMBOL(device_add_disk_no_queue_reg);
>
> -static void invalidate_partition(struct gendisk *disk, int partno)
> +static void invalidate_partition(struct block_device *bdev)
> {
> - struct block_device *bdev;
> -
> - bdev = bdget_disk(disk, partno);
> - if (!bdev)
> - return;
> -
> fsync_bdev(bdev);
> __invalidate_device(bdev, true);
>
> @@ -808,7 +802,6 @@ static void invalidate_partition(struct gendisk *disk, int partno)
> * up any more even if openers still hold references to it.
> */
> remove_inode_hash(bdev->bd_inode);
> - bdput(bdev);
> }
>
> /**
> @@ -853,12 +846,12 @@ void del_gendisk(struct gendisk *disk)
> disk_part_iter_init(&piter, disk,
> DISK_PITER_INCL_EMPTY | DISK_PITER_REVERSE);
> while ((part = disk_part_iter_next(&piter))) {
> - invalidate_partition(disk, part->bdev->bd_partno);
> + invalidate_partition(part->bdev);
> delete_partition(part);
> }
> disk_part_iter_exit(&piter);
>
> - invalidate_partition(disk, 0);
> + invalidate_partition(disk->part0);
> set_capacity(disk, 0);
> disk->flags &= ~GENHD_FL_UP;
> up_write(&bdev_lookup_sem);
> --
> 2.29.2
>
--
Jan Kara <jack@xxxxxxxx>
SUSE Labs, CR
