aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2015-06-20 22:50:33 -0400
committerBen Hutchings <ben@decadent.org.uk>2015-08-12 16:33:16 +0200
commit5dedaea4936981382ec0d9833ad372ebd3d8af57 (patch)
tree8d1a36a8849be7dab1f19c4d5038434a1ec9fd5a
parenta0ded612c39a4aee8d1f0a5afdfdcf0382be0b8e (diff)
downloadkernel_samsung_smdk4412-5dedaea4936981382ec0d9833ad372ebd3d8af57.zip
kernel_samsung_smdk4412-5dedaea4936981382ec0d9833ad372ebd3d8af57.tar.gz
kernel_samsung_smdk4412-5dedaea4936981382ec0d9833ad372ebd3d8af57.tar.bz2
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: Ben Hutchings <ben@decadent.org.uk>
-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 422be11..be4db0e 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -857,6 +857,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) {
/*