Commit f9a4843c authored by Baokun Li's avatar Baokun Li
Browse files

Revert "ext4: drop EXT4_MF_FS_ABORTED flag" 

hulk inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBEQJ3



--------------------------------

This reverts commit 95257987.

When an error is triggered in 'errors=remount-ro' mode, the file system
becomes read-only, meaning it should be readable but not writable. The
reverted patch set EXT4_FLAGS_SHUTDOWN, which caused read operations to
also return -EIO. Therefore, this patch was reverted to avoid this
mechanism change.

Fixes: 95257987 ("ext4: drop EXT4_MF_FS_ABORTED flag")
Signed-off-by: default avatarBaokun Li <libaokun1@huawei.com>
parent 8aeecaae

fs/ext4/ext4.h

+1 −0
Original line number Diff line number Diff line
@@ -1821,6 +1821,7 @@ static inline int ext4_valid_inum(struct super_block *sb, unsigned long ino) 
 */

enum {

	EXT4_MF_MNTDIR_SAMPLED,

	EXT4_MF_FS_ABORTED,	/* Fatal error detected */

	EXT4_MF_FC_INELIGIBLE	/* Fast commit ineligible */

};

fs/ext4/fsync.c

+4 −3
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ int ext4_sync_file(struct file *file, loff_t start, loff_t end, int datasync) 
	int ret = 0, err;

	bool needs_barrier = false;

	struct inode *inode = file->f_mapping->host;

	struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);



	if (unlikely(ext4_forced_shutdown(inode->i_sb)))

		return -EIO;
@@ -140,14 +141,14 @@ int ext4_sync_file(struct file *file, loff_t start, loff_t end, int datasync) 
	trace_ext4_sync_file_enter(file, datasync);



	if (sb_rdonly(inode->i_sb)) {

		/* Make sure that we read updated s_ext4_flags value */

		/* Make sure that we read updated s_mount_flags value */

		smp_rmb();

		if (ext4_forced_shutdown(inode->i_sb))

		if (ext4_test_mount_flag(inode->i_sb, EXT4_MF_FS_ABORTED))

			ret = -EROFS;

		goto out;

	}



	if (!EXT4_SB(inode->i_sb)->s_journal) {

	if (!sbi->s_journal) {

		ret = ext4_fsync_nojournal(file, start, end, datasync,

					   &needs_barrier);

		if (needs_barrier)

fs/ext4/inode.c

+5 −3
Original line number Diff line number Diff line
@@ -2293,7 +2293,8 @@ static int mpage_map_and_submit_extent(handle_t *handle, 
		if (err < 0) {

			struct super_block *sb = inode->i_sb;



			if (ext4_forced_shutdown(sb))

			if (ext4_forced_shutdown(sb) ||

			    ext4_test_mount_flag(sb, EXT4_MF_FS_ABORTED))

				goto invalidate_dirty_pages;

			/*

			 * Let the uper layers retry transient errors.
@@ -2616,13 +2617,14 @@ static int ext4_do_writepages(struct mpage_da_data *mpd) 
	 * If the filesystem has aborted, it is read-only, so return

	 * right away instead of dumping stack traces later on that

	 * will obscure the real source of the problem.  We test

	 * fs shutdown state instead of sb->s_flag's SB_RDONLY because

	 * EXT4_MF_FS_ABORTED instead of sb->s_flag's SB_RDONLY because

	 * the latter could be true if the filesystem is mounted

	 * read-only, and in that case, ext4_writepages should

	 * *never* be called, so if that ever happens, we would want

	 * the stack trace.

	 */

	if (unlikely(ext4_forced_shutdown(mapping->host->i_sb))) {

	if (unlikely(ext4_forced_shutdown(mapping->host->i_sb) ||

		     ext4_test_mount_flag(inode->i_sb, EXT4_MF_FS_ABORTED))) {

		ret = -EROFS;

		goto out_writepages;

	}

fs/ext4/mballoc.c

+2 −2
Original line number Diff line number Diff line
@@ -5740,7 +5740,7 @@ static inline void ext4_mb_show_pa(struct super_block *sb) 
{

	ext4_group_t i, ngroups;



	if (ext4_forced_shutdown(sb))

	if (ext4_test_mount_flag(sb, EXT4_MF_FS_ABORTED))

		return;



	ngroups = ext4_get_groups_count(sb);
@@ -5774,7 +5774,7 @@ static void ext4_mb_show_ac(struct ext4_allocation_context *ac) 
{

	struct super_block *sb = ac->ac_sb;



	if (ext4_forced_shutdown(sb))

	if (ext4_test_mount_flag(sb, EXT4_MF_FS_ABORTED))

		return;



	mb_debug(sb, "Can't allocate:"

fs/ext4/super.c

+2 −2
Original line number Diff line number Diff line
@@ -779,7 +779,7 @@ static void ext4_handle_error(struct super_block *sb, bool force_ro, int error, 
		WARN_ON_ONCE(1);



	if (!continue_fs && !sb_rdonly(sb)) {

		set_bit(EXT4_FLAGS_SHUTDOWN, &EXT4_SB(sb)->s_ext4_flags);

		ext4_set_mount_flag(sb, EXT4_MF_FS_ABORTED);

		if (journal)

			jbd2_journal_abort(journal, -EIO);

	}
@@ -6684,7 +6684,7 @@ static int __ext4_remount(struct fs_context *fc, struct super_block *sb) 
	flush_work(&sbi->s_sb_upd_work);



	if ((bool)(fc->sb_flags & SB_RDONLY) != sb_rdonly(sb)) {

		if (ext4_forced_shutdown(sb)) {

		if (ext4_test_mount_flag(sb, EXT4_MF_FS_ABORTED)) {

			err = -EROFS;

			goto restore_opts;

		}