From: Christoph Hellwig Date: Mon, 16 Nov 2020 14:56:53 +0000 (+0100) Subject: loop: let set_capacity_revalidate_and_notify update the bdev size X-Git-Tag: v5.10.234~84 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dddf715058575578f0bf2fe851a422b28ab81e4a;p=thirdparty%2Fkernel%2Fstable.git loop: let set_capacity_revalidate_and_notify update the bdev size [ Upstream commit 3b4f85d02a4bd85cbea999a064235a47694bbb7b ] There is no good reason to call revalidate_disk_size separately. Signed-off-by: Christoph Hellwig Reviewed-by: Hannes Reinecke Signed-off-by: Jens Axboe Stable-dep-of: 74363ec674cb ("zram: fix uninitialized ZRAM not releasing backing device") Signed-off-by: Sasha Levin --- diff --git a/drivers/block/loop.c b/drivers/block/loop.c index 7444cc2a6c86d..198f7ce3234b5 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -238,12 +238,8 @@ static void __loop_update_dio(struct loop_device *lo, bool dio) */ static void loop_set_size(struct loop_device *lo, loff_t size) { - struct block_device *bdev = lo->lo_device; - - bd_set_nr_sectors(bdev, size); - - if (!set_capacity_revalidate_and_notify(lo->lo_disk, size, false)) - kobject_uevent(&disk_to_dev(bdev->bd_disk)->kobj, KOBJ_CHANGE); + if (!set_capacity_revalidate_and_notify(lo->lo_disk, size, true)) + kobject_uevent(&disk_to_dev(lo->lo_disk)->kobj, KOBJ_CHANGE); } static inline int