Commit 5bc27f4d authored by Baokun Li's avatar Baokun Li Committed by Theodore Ts'o
Browse files

ext4: add more ext4_emergency_state() checks around sb_rdonly() 



Some functions check sb_rdonly() to make sure the file system isn't
modified after it's read-only. Since we also don't want the file system
modified if it's in an emergency state (shutdown or emergency_ro),
we're adding additional ext4_emergency_state() checks where sb_rdonly()
is checked.

Suggested-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarBaokun Li <libaokun1@huawei.com>
Reviewed-by: default avatarZhang Yi <yi.zhang@huawei.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Link: https://patch.msgid.link/20250122114130.229709-5-libaokun@huaweicloud.com


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 0a1b2f5e

fs/ext4/file.c

+2 −1
Original line number Diff line number Diff line
@@ -844,7 +844,8 @@ static int ext4_sample_last_mounted(struct super_block *sb, 
	if (likely(ext4_test_mount_flag(sb, EXT4_MF_MNTDIR_SAMPLED)))

		return 0;



	if (sb_rdonly(sb) || !sb_start_intwrite_trylock(sb))

	if (ext4_emergency_state(sb) || sb_rdonly(sb) ||

	    !sb_start_intwrite_trylock(sb))

		return 0;



	ext4_set_mount_flag(sb, EXT4_MF_MNTDIR_SAMPLED);

fs/ext4/ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -1705,7 +1705,7 @@ int ext4_update_overhead(struct super_block *sb, bool force) 
{

	struct ext4_sb_info *sbi = EXT4_SB(sb);



	if (sb_rdonly(sb))

	if (ext4_emergency_state(sb) || sb_rdonly(sb))

		return 0;

	if (!force &&

	    (sbi->s_overhead == 0 ||

fs/ext4/super.c

+15 −11
Original line number Diff line number Diff line
@@ -472,8 +472,9 @@ static void ext4_maybe_update_superblock(struct super_block *sb) 
	__u64 lifetime_write_kbytes;

	__u64 diff_size;



	if (sb_rdonly(sb) || !(sb->s_flags & SB_ACTIVE) ||

	    !journal || (journal->j_flags & JBD2_UNMOUNT))

	if (ext4_emergency_state(sb) || sb_rdonly(sb) ||

	    !(sb->s_flags & SB_ACTIVE) || !journal ||

	    journal->j_flags & JBD2_UNMOUNT)

		return;



	now = ktime_get_real_seconds();
@@ -750,7 +751,8 @@ static void update_super_work(struct work_struct *work) 
	 * We use directly jbd2 functions here to avoid recursing back into

	 * ext4 error handling code during handling of previous errors.

	 */

	if (!sb_rdonly(sbi->s_sb) && journal) {

	if (!ext4_emergency_state(sbi->s_sb) &&

	    !sb_rdonly(sbi->s_sb) && journal) {

		struct buffer_head *sbh = sbi->s_sbh;

		bool call_notify_err = false;
@@ -1310,13 +1312,14 @@ static void ext4_put_super(struct super_block *sb) 
	ext4_mb_release(sb);

	ext4_ext_release(sb);



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

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

		if (!aborted) {

			ext4_clear_feature_journal_needs_recovery(sb);

			ext4_clear_feature_orphan_present(sb);

			es->s_state = cpu_to_le16(sbi->s_mount_state);

		}

	if (!sb_rdonly(sb))

		ext4_commit_super(sb);

	}



	ext4_group_desc_free(sbi);

	ext4_flex_groups_free(sbi);
@@ -3684,7 +3687,8 @@ static int ext4_run_li_request(struct ext4_li_request *elr) 
		if (group >= elr->lr_next_group) {

			ret = 1;

			if (elr->lr_first_not_zeroed != ngroups &&

			    !sb_rdonly(sb) && test_opt(sb, INIT_INODE_TABLE)) {

			    !ext4_emergency_state(sb) && !sb_rdonly(sb) &&

			    test_opt(sb, INIT_INODE_TABLE)) {

				elr->lr_next_group = elr->lr_first_not_zeroed;

				elr->lr_mode = EXT4_LI_MODE_ITABLE;

				ret = 0;
@@ -3989,7 +3993,7 @@ int ext4_register_li_request(struct super_block *sb, 
		goto out;

	}



	if (sb_rdonly(sb) ||

	if (ext4_emergency_state(sb) || sb_rdonly(sb) ||

	    (test_opt(sb, NO_PREFETCH_BLOCK_BITMAPS) &&

	     (first_not_zeroed == ngroups || !test_opt(sb, INIT_INODE_TABLE))))

		goto out;