diff options
| author | Andrew Patterson <andrew.patterson@hp.com> | 2008-09-04 14:27:40 -0600 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2008-10-09 08:56:13 +0200 |
| commit | 56ade44b46780fa291fa68b824f1dafdcb11b0ca (patch) | |
| tree | 2232dc9a9e6b080428e4e6e0a32bcc7c83cc1731 /fs/block_dev.c | |
| parent | f98a8cae12f2b2a8f9bfd7a53c990a1a405e880e (diff) | |
| download | linux-stable-56ade44b46780fa291fa68b824f1dafdcb11b0ca.tar.gz linux-stable-56ade44b46780fa291fa68b824f1dafdcb11b0ca.tar.bz2 linux-stable-56ade44b46780fa291fa68b824f1dafdcb11b0ca.zip | |
Added flush_disk to factor out common buffer cache flushing code.
We need to be able to flush the buffer cache for for more than
just when a disk is changed, so we factor out common cache flush code
in check_disk_change() to an internal flush_disk() routine. This
routine will then be used for both disk changes and disk resizes (in a
later patch).
Include the disk name in the text indicating that there are busy
inodes on the device and increase the KERN severity of the message.
Signed-off-by: Andrew Patterson <andrew.patterson@hp.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'fs/block_dev.c')
| -rw-r--r-- | fs/block_dev.c | 32 |
1 files changed, 27 insertions, 5 deletions
diff --git a/fs/block_dev.c b/fs/block_dev.c index b721955d382e..33650fc537c4 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -853,6 +853,32 @@ struct block_device *open_by_devnum(dev_t dev, unsigned mode) EXPORT_SYMBOL(open_by_devnum); /** + * flush_disk - invalidates all buffer-cache entries on a disk + * + * @bdev: struct block device to be flushed + * + * 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) +{ + if (__invalidate_device(bdev)) { + char name[BDEVNAME_SIZE] = ""; + + if (bdev->bd_disk) + disk_name(bdev->bd_disk, 0, name); + printk(KERN_WARNING "VFS: busy inodes on changed media or " + "resized disk %s\n", name); + } + + if (!bdev->bd_disk) + return; + if (disk_partitionable(bdev->bd_disk)) + bdev->bd_invalidated = 1; +} + +/** * check_disk_size_change - checks for disk size change and adjusts * bdev size. * @@ -929,13 +955,9 @@ int check_disk_change(struct block_device *bdev) if (!bdops->media_changed(bdev->bd_disk)) return 0; - if (__invalidate_device(bdev)) - printk("VFS: busy inodes on changed media.\n"); - + flush_disk(bdev); if (bdops->revalidate_disk) bdops->revalidate_disk(bdev->bd_disk); - if (disk_partitionable(bdev->bd_disk)) - bdev->bd_invalidated = 1; return 1; } |