diff options
author | Theodore Ts'o <tytso@mit.edu> | 2015-06-20 22:50:33 -0400 |
---|---|---|
committer | Zefan Li <lizefan@huawei.com> | 2015-10-22 09:20:05 +0800 |
commit | b80954b45832fbd665c2a8bc545601716942ce78 (patch) | |
tree | 7eca3dad92eb6f76487f2f9b8ee7c2a5d659a3b0 | |
parent | 9beee8b18a53aaf9a9678245dd1687a0430d862b (diff) |
ext4: call sync_blockdev() before invalidate_bdev() in put_super()
commit 89d96a6f8e6491f24fc8f99fd6ae66820e85c6c1 upstream.
Normally all of the buffers will have been forced out to disk before
we call invalidate_bdev(), but there will be some cases, where a file
system operation was aborted due to an ext4_error(), where there may
still be some dirty buffers in the buffer cache for the device. So
try to force them out to memory before calling invalidate_bdev().
This fixes a warning triggered by generic/081:
WARNING: CPU: 1 PID: 3473 at /usr/projects/linux/ext4/fs/block_dev.c:56 __blkdev_put+0xb5/0x16f()
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Zefan Li <lizefan@huawei.com>
-rw-r--r-- | fs/ext4/super.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 92ea560efcc7..2e26a542c818 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -888,6 +888,7 @@ static void ext4_put_super(struct super_block *sb) dump_orphan_list(sb, sbi); J_ASSERT(list_empty(&sbi->s_orphan)); + sync_blockdev(sb->s_bdev); invalidate_bdev(sb->s_bdev); if (sbi->journal_bdev && sbi->journal_bdev != sb->s_bdev) { /* |