From: Ye Bin <yebin10(a)huawei.com>
hulk inclusion
category: bugfix
bugzilla: 50614
CVE: NA
-----------------------------------------------
Fixes: 24d1ffda34be("ext4: don't remount read-only with errors=continue on reboot")
Signed-off-by: Ye Bin <yebin10(a)huawei.com>
Reviewed-by: zhangyi (F) <yi.zhang(a)huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com>
---
fs/ext4/super.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 15f8aeda9ee7f..18870ae874ab6 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -509,9 +509,12 @@ static void ext4_handle_error(struct super_block *sb)
if (test_opt(sb, WARN_ON_ERROR))
WARN_ON_ONCE(1);
- if (sb_rdonly(sb) || test_opt(sb, ERRORS_CONT))
+ if (sb_rdonly(sb))
return;
+ if (test_opt(sb, ERRORS_CONT))
+ goto out;
+
EXT4_SB(sb)->s_mount_flags |= EXT4_MF_FS_ABORTED;
if (journal)
jbd2_journal_abort(journal, -EIO);
@@ -533,6 +536,7 @@ static void ext4_handle_error(struct super_block *sb)
sb->s_id);
}
+out:
ext4_netlink_send_info(sb, 1);
}
--
2.25.1