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

!1339 [sync] PR-1286: ext4: turning quotas off if mount failed after enable quotas 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/1286 
 
PR sync from: Baokun Li <libaokun1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/X3ZSP2AARUKCTNGQH7V2EC4D2KQ67AMO/ 
 
 
Link:https://gitee.com/openeuler/kernel/pulls/1339

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 1bbf030e 5f7ae95a

fs/ext4/super.c

+4 −2
Original line number Diff line number Diff line
@@ -5156,7 +5156,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) 
		ext4_msg(sb, KERN_INFO, "recovery complete");

		err = ext4_mark_recovery_complete(sb, es);

		if (err)

			goto failed_mount8;

			goto failed_mount10;

	}

	if (EXT4_SB(sb)->s_journal) {

		if (test_opt(sb, DATA_FLAGS) == EXT4_MOUNT_JOURNAL_DATA)
@@ -5201,7 +5201,9 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) 
		ext4_msg(sb, KERN_ERR, "VFS: Can't find ext4 filesystem");

	goto failed_mount;



failed_mount8:

failed_mount10:

	ext4_quota_off_umount(sb);

failed_mount8: __maybe_unused

	ext4_unregister_sysfs(sb);

	kobject_put(&sbi->s_kobj);

failed_mount7: