Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-17 02:36:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

block: don't print a message when the device went away

Browse Source 
The information about a size change in this case just creates confusion.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2018-05-29 16:42:59 +02:00 committed by Jens Axboe
parent 4163a03984
commit 5afb78356c
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
block/partition-generic.c
View File

@ -516,7 +516,7 @@ rescan:
if (disk->fops->revalidate_disk) if (disk->fops->revalidate_disk)
disk->fops->revalidate_disk(disk); disk->fops->revalidate_disk(disk);
check_disk_size_change(disk, bdev); check_disk_size_change(disk, bdev, true);
bdev->bd_invalidated = 0; bdev->bd_invalidated = 0;
if (!get_capacity(disk) || !(state = check_partition(disk, bdev))) if (!get_capacity(disk) || !(state = check_partition(disk, bdev)))
return 0; return 0;
@ -641,7 +641,7 @@ int invalidate_partitions(struct gendisk *disk, struct block_device *bdev)
return res; return res;
set_capacity(disk, 0); set_capacity(disk, 0);
check_disk_size_change(disk, bdev); check_disk_size_change(disk, bdev, false);
bdev->bd_invalidated = 0; bdev->bd_invalidated = 0;
/* tell userspace that the media / partition table may have changed */ /* tell userspace that the media / partition table may have changed */
kobject_uevent(&disk_to_dev(disk)->kobj, KOBJ_CHANGE); kobject_uevent(&disk_to_dev(disk)->kobj, KOBJ_CHANGE);

14
fs/block_dev.c
View File

@ -1322,21 +1322,25 @@ static void flush_disk(struct block_device *bdev, bool kill_dirty)
* check_disk_size_change - checks for disk size change and adjusts bdev size. * check_disk_size_change - checks for disk size change and adjusts bdev size.
* @disk: struct gendisk to check * @disk: struct gendisk to check
* @bdev: struct bdev to adjust. * @bdev: struct bdev to adjust.
* @verbose: if %true log a message about a size change if there is any
* *
* This routine checks to see if the bdev size does not match the disk size * This routine checks to see if the bdev size does not match the disk size
* and adjusts it if it differs. When shrinking the bdev size, its all caches * and adjusts it if it differs. When shrinking the bdev size, its all caches
* are freed. * are freed.
*/ */
void check_disk_size_change(struct gendisk *disk, struct block_device *bdev) void check_disk_size_change(struct gendisk *disk, struct block_device *bdev,
bool verbose)
{ {
loff_t disk_size, bdev_size; loff_t disk_size, bdev_size;
disk_size = (loff_t)get_capacity(disk) << 9; disk_size = (loff_t)get_capacity(disk) << 9;
bdev_size = i_size_read(bdev->bd_inode); bdev_size = i_size_read(bdev->bd_inode);
if (disk_size != bdev_size) { if (disk_size != bdev_size) {
printk(KERN_INFO if (verbose) {
"%s: detected capacity change from %lld to %lld\n", printk(KERN_INFO
disk->disk_name, bdev_size, disk_size); "%s: detected capacity change from %lld to %lld\n",
disk->disk_name, bdev_size, disk_size);
}
i_size_write(bdev->bd_inode, disk_size); i_size_write(bdev->bd_inode, disk_size);
if (bdev_size > disk_size) if (bdev_size > disk_size)
flush_disk(bdev, false); flush_disk(bdev, false);
@ -1363,7 +1367,7 @@ int revalidate_disk(struct gendisk *disk)
return ret; return ret;
mutex_lock(&bdev->bd_mutex); mutex_lock(&bdev->bd_mutex);
check_disk_size_change(disk, bdev); check_disk_size_change(disk, bdev, ret == 0);
bdev->bd_invalidated = 0; bdev->bd_invalidated = 0;
mutex_unlock(&bdev->bd_mutex); mutex_unlock(&bdev->bd_mutex);
bdput(bdev); bdput(bdev);

2
include/linux/fs.h
View File

@ -2570,7 +2570,7 @@ extern bool is_bad_inode(struct inode *);
#ifdef CONFIG_BLOCK #ifdef CONFIG_BLOCK
extern void check_disk_size_change(struct gendisk *disk, extern void check_disk_size_change(struct gendisk *disk,
struct block_device *bdev); struct block_device *bdev, bool verbose);
extern int revalidate_disk(struct gendisk *); extern int revalidate_disk(struct gendisk *);
extern int check_disk_change(struct block_device *); extern int check_disk_change(struct block_device *);
extern int __invalidate_device(struct block_device *, bool); extern int __invalidate_device(struct block_device *, bool);