diff options
| author | Zhang Xiaoxu <zhangxiaoxu5@huawei.com> | 2020-09-27 22:05:56 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2020-10-18 10:36:59 -0400 |
| commit | 9704a322ea67fdb05fc66cf431fdd01c2424bbd9 (patch) | |
| tree | f1ae6776ec0a38cef434aa95149173449d92f37f /fs/ext4/super.c | |
| parent | dd0db94f305c9f5dd44d0ecc7bf29944d4867074 (diff) | |
| download | linux-stable-9704a322ea67fdb05fc66cf431fdd01c2424bbd9.tar.gz linux-stable-9704a322ea67fdb05fc66cf431fdd01c2424bbd9.tar.bz2 linux-stable-9704a322ea67fdb05fc66cf431fdd01c2424bbd9.zip | |
ext4: fix bdev write error check failed when mount fs with ro
Consider a situation when a filesystem was uncleanly shutdown and the
orphan list is not empty and a read-only mount is attempted. The orphan
list cleanup during mount will fail with:
ext4_check_bdev_write_error:193: comm mount: Error while async write back metadata
This happens because sbi->s_bdev_wb_err is not initialized when mounting
the filesystem in read only mode and so ext4_check_bdev_write_error()
falsely triggers.
Initialize sbi->s_bdev_wb_err unconditionally to avoid this problem.
Fixes: bc71726c7257 ("ext4: abort the filesystem if failed to async write metadata buffer")
Cc: stable@kernel.org
Signed-off-by: Zhang Xiaoxu <zhangxiaoxu5@huawei.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20200928020556.710971-1-zhangxiaoxu5@huawei.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/super.c')
| -rw-r--r-- | fs/ext4/super.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index d1ea1c7fc8c4..61af903e7b32 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -4825,9 +4825,8 @@ no_journal: * used to detect the metadata async write error. */ spin_lock_init(&sbi->s_bdev_wb_lock); - if (!sb_rdonly(sb)) - errseq_check_and_advance(&sb->s_bdev->bd_inode->i_mapping->wb_err, - &sbi->s_bdev_wb_err); + errseq_check_and_advance(&sb->s_bdev->bd_inode->i_mapping->wb_err, + &sbi->s_bdev_wb_err); sb->s_bdev->bd_super = sb; EXT4_SB(sb)->s_mount_state |= EXT4_ORPHAN_FS; ext4_orphan_cleanup(sb, es); @@ -5720,14 +5719,6 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data) } /* - * Update the original bdev mapping's wb_err value - * which could be used to detect the metadata async - * write error. - */ - errseq_check_and_advance(&sb->s_bdev->bd_inode->i_mapping->wb_err, - &sbi->s_bdev_wb_err); - - /* * Mounting a RDONLY partition read-write, so reread * and store the current valid flag. (It may have * been changed by e2fsck since we originally mounted |