aboutsummaryrefslogtreecommitdiffstats
path: root/fs/inode.c
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2011-02-24 01:25:47 -0500
committerNeilBrown <neilb@suse.de>2011-02-24 01:25:47 -0500
commit93b270f76e7ef3b81001576860c2701931cdc78b (patch)
treeabaca0e4d3e86721815498fafd06295dd9cfd002 /fs/inode.c
parentda9cf5050a2e3dbc3cf26a8d908482eb4485ed49 (diff)
Fix over-zealous flush_disk when changing device size.
There are two cases when we call flush_disk. In one, the device has disappeared (check_disk_change) so any data will hold becomes irrelevant. In the oter, the device has changed size (check_disk_size_change) so data we hold may be irrelevant. In both cases it makes sense to discard any 'clean' buffers, so they will be read back from the device if needed. In the former case it makes sense to discard 'dirty' buffers as there will never be anywhere safe to write the data. In the second case it *does*not* make sense to discard dirty buffers as that will lead to file system corruption when you simply enlarge the containing devices. flush_disk calls __invalidate_devices. __invalidate_device calls both invalidate_inodes and invalidate_bdev. invalidate_inodes *does* discard I_DIRTY inodes and this does lead to fs corruption. invalidate_bev *does*not* discard dirty pages, but I don't really care about that at present. So this patch adds a flag to __invalidate_device (calling it __invalidate_device2) to indicate whether dirty buffers should be killed, and this is passed to invalidate_inodes which can choose to skip dirty inodes. flusk_disk then passes true from check_disk_change and false from check_disk_size_change. dm avoids tripping over this problem by calling i_size_write directly rathher than using check_disk_size_change. md does use check_disk_size_change and so is affected. This regression was introduced by commit 608aeef17a which causes check_disk_size_change to call flush_disk, so it is suitable for any kernel since 2.6.27. Cc: stable@kernel.org Acked-by: Jeff Moyer <jmoyer@redhat.com> Cc: Andrew Patterson <andrew.patterson@hp.com> Cc: Jens Axboe <axboe@kernel.dk> Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'fs/inode.c')
-rw-r--r--fs/inode.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/fs/inode.c b/fs/inode.c
index da85e56378f3..c50d7feb87b1 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -540,11 +540,14 @@ void evict_inodes(struct super_block *sb)
540/** 540/**
541 * invalidate_inodes - attempt to free all inodes on a superblock 541 * invalidate_inodes - attempt to free all inodes on a superblock
542 * @sb: superblock to operate on 542 * @sb: superblock to operate on
543 * @kill_dirty: flag to guide handling of dirty inodes
543 * 544 *
544 * Attempts to free all inodes for a given superblock. If there were any 545 * Attempts to free all inodes for a given superblock. If there were any
545 * busy inodes return a non-zero value, else zero. 546 * busy inodes return a non-zero value, else zero.
547 * If @kill_dirty is set, discard dirty inodes too, otherwise treat
548 * them as busy.
546 */ 549 */
547int invalidate_inodes(struct super_block *sb) 550int invalidate_inodes(struct super_block *sb, bool kill_dirty)
548{ 551{
549 int busy = 0; 552 int busy = 0;
550 struct inode *inode, *next; 553 struct inode *inode, *next;
@@ -556,6 +559,10 @@ int invalidate_inodes(struct super_block *sb)
556 list_for_each_entry_safe(inode, next, &sb->s_inodes, i_sb_list) { 559 list_for_each_entry_safe(inode, next, &sb->s_inodes, i_sb_list) {
557 if (inode->i_state & (I_NEW | I_FREEING | I_WILL_FREE)) 560 if (inode->i_state & (I_NEW | I_FREEING | I_WILL_FREE))
558 continue; 561 continue;
562 if (inode->i_state & I_DIRTY && !kill_dirty) {
563 busy = 1;
564 continue;
565 }
559 if (atomic_read(&inode->i_count)) { 566 if (atomic_read(&inode->i_count)) {
560 busy = 1; 567 busy = 1;
561 continue; 568 continue;