Unverified Commit df4c334b authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!13961 ext4: avoid remount errors with 'abort' mount option 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yongjian Sun <sunyongjian1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/47IA7HDSCDT22TYLJNDUPUUMHKVN46BL/ 
 
https://gitee.com/src-openeuler/kernel/issues/IB2YWS 
 
Link:https://gitee.com/openeuler/kernel/pulls/13961

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 510b4e28 c3c1716d

fs/ext4/super.c

+8 −3
Original line number Diff line number Diff line
@@ -6662,9 +6662,6 @@ static int __ext4_remount(struct fs_context *fc, struct super_block *sb) 
		goto restore_opts;

	}



	if (test_opt2(sb, ABORT))

		ext4_abort(sb, ESHUTDOWN, "Abort forced by user");



	sb->s_flags = (sb->s_flags & ~SB_POSIXACL) |

		(test_opt(sb, POSIX_ACL) ? SB_POSIXACL : 0);
@@ -6833,6 +6830,14 @@ static int __ext4_remount(struct fs_context *fc, struct super_block *sb) 
	if (!ext4_has_feature_mmp(sb) || sb_rdonly(sb))

		ext4_stop_mmpd(sbi);



	/*

	 * Handle aborting the filesystem as the last thing during remount to

	 * avoid obsure errors during remount when some option changes fail to

	 * apply due to shutdown filesystem.

	 */

	if (test_opt2(sb, ABORT))

		ext4_abort(sb, ESHUTDOWN, "Abort forced by user");



	return 0;



restore_opts: