diff options
| author |   Christoph Hellwig <hch@lst.de> | 2020-07-08 14:25:43 +0200 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2020-07-08 16:20:01 -0600 |
| commit | 9a3ffbbc6561ff878261727585ef8ee89bb36424 (patch) | |
| tree | 1a0551a01c6683b10b6291c76323c51a46c5619e /fs/block_dev.c | |
| parent | cdrom: remove the unused cdrom_media_changed function (diff) | |
| download | wireguard-linux-9a3ffbbc6561ff878261727585ef8ee89bb36424.tar.xz wireguard-linux-9a3ffbbc6561ff878261727585ef8ee89bb36424.zip | |
block: remove flush_disk
flush_disk has only two callers, so open code it there. That also helps
clarifying the error message for the particular case, and allows to remove
setting bd_invalidated in check_disk_size_change, which will be cleared
again instantly.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs/block_dev.c')
| -rw-r--r-- | fs/block_dev.c | 30 |
1 files changed, 7 insertions, 23 deletions
diff --git a/fs/block_dev.c b/fs/block_dev.c index 2d2fcb50e78e..a36d5b6907ea 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -1348,26 +1348,6 @@ EXPORT_SYMBOL_GPL(bd_unlink_disk_holder); #endif /** - * flush_disk - invalidates all buffer-cache entries on a disk - * - * @bdev: struct block device to be flushed - * @kill_dirty: flag to guide handling of dirty inodes - * - * Invalidates all buffer-cache entries on a disk. It should be called - * when a disk has been changed -- either by a media change or online - * resize. - */ -static void flush_disk(struct block_device *bdev, bool kill_dirty) -{ - if (__invalidate_device(bdev, kill_dirty)) { - printk(KERN_WARNING "VFS: busy inodes on changed media or " - "resized disk %s\n", - bdev->bd_disk ? bdev->bd_disk->disk_name : ""); - } - bdev->bd_invalidated = 1; -} - -/** * check_disk_size_change - checks for disk size change and adjusts bdev size. * @disk: struct gendisk to check * @bdev: struct bdev to adjust. @@ -1391,8 +1371,9 @@ static void check_disk_size_change(struct gendisk *disk, disk->disk_name, bdev_size, disk_size); } i_size_write(bdev->bd_inode, disk_size); - if (bdev_size > disk_size) - flush_disk(bdev, false); + if (bdev_size > disk_size && __invalidate_device(bdev, false)) + pr_warn("VFS: busy inodes on resized disk %s\n", + disk->disk_name); } bdev->bd_invalidated = 0; } @@ -1451,7 +1432,10 @@ int check_disk_change(struct block_device *bdev) if (!(events & DISK_EVENT_MEDIA_CHANGE)) return 0; - flush_disk(bdev, true); + if (__invalidate_device(bdev, true)) + pr_warn("VFS: busy inodes on changed media %s\n", + disk->disk_name); + bdev->bd_invalidated = 1; if (bdops->revalidate_disk) bdops->revalidate_disk(bdev->bd_disk); return 1; |