summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2015-06-20 22:50:33 -0400
committerJiri Slaby <jslaby@suse.cz>2015-08-04 16:52:02 +0200
commit18cb11c2ca2e4e786aa1b1f58c978aa33885944a (patch)
treea62e4b7ee354900a8f012dc7030e96f9df8ffe45 /fs
parentea7fac0e77d18783fd70cc40abc390d88aac8422 (diff)
downloadlwn-18cb11c2ca2e4e786aa1b1f58c978aa33885944a.tar.gz
lwn-18cb11c2ca2e4e786aa1b1f58c978aa33885944a.zip
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: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'fs')
-rw-r--r--fs/ext4/super.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 6795499fefab..d520064ceddb 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -813,6 +813,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) {
/*