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

!7901 f2fs: fix to avoid racing on fsync_entry_slab by multi filesystem instances 

Merge Pull Request from: @ci-robot 
 
PR sync from: Ye Bin <yebin10@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/B7ELSVBXJXIGSMUTWNTTSMBXRJNVLJU2/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9RLZ0 
 
Link:https://gitee.com/openeuler/kernel/pulls/7901

 

Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 55629e36 21d0fe9f

fs/f2fs/f2fs.h

+2 −0
Original line number Diff line number Diff line
@@ -3095,6 +3095,8 @@ void f2fs_build_gc_manager(struct f2fs_sb_info *sbi); 
 */

int f2fs_recover_fsync_data(struct f2fs_sb_info *sbi, bool check_only);

bool f2fs_space_for_roll_forward(struct f2fs_sb_info *sbi);

int __init f2fs_create_recovery_cache(void);

void f2fs_destroy_recovery_cache(void);



/*

 * debug.c

fs/f2fs/recovery.c

+14 −9
Original line number Diff line number Diff line
@@ -683,13 +683,6 @@ int f2fs_recover_fsync_data(struct f2fs_sb_info *sbi, bool check_only) 
	quota_enabled = f2fs_enable_quota_files(sbi, s_flags & SB_RDONLY);

#endif



	fsync_entry_slab = f2fs_kmem_cache_create("f2fs_fsync_inode_entry",

			sizeof(struct fsync_inode_entry));

	if (!fsync_entry_slab) {

		err = -ENOMEM;

		goto out;

	}



	INIT_LIST_HEAD(&inode_list);

	INIT_LIST_HEAD(&tmp_inode_list);

	INIT_LIST_HEAD(&dir_list);
@@ -747,8 +740,6 @@ int f2fs_recover_fsync_data(struct f2fs_sb_info *sbi, bool check_only) 
		}

	}



	kmem_cache_destroy(fsync_entry_slab);

out:

#ifdef CONFIG_QUOTA

	/* Turn quotas off */

	if (quota_enabled)
@@ -758,3 +749,17 @@ int f2fs_recover_fsync_data(struct f2fs_sb_info *sbi, bool check_only) 


	return ret ? ret: err;

}



int __init f2fs_create_recovery_cache(void)

{

	fsync_entry_slab = f2fs_kmem_cache_create("f2fs_fsync_inode_entry",

					sizeof(struct fsync_inode_entry));

	if (!fsync_entry_slab)

		return -ENOMEM;

	return 0;

}



void f2fs_destroy_recovery_cache(void)

{

	kmem_cache_destroy(fsync_entry_slab);

}

fs/f2fs/super.c

+7 −1
Original line number Diff line number Diff line
@@ -3305,9 +3305,12 @@ static int __init init_f2fs_fs(void) 
	err = f2fs_create_checkpoint_caches();

	if (err)

		goto free_segment_manager_caches;

	err = f2fs_create_extent_cache();

	err = f2fs_create_recovery_cache();

	if (err)

		goto free_checkpoint_caches;

	err = f2fs_create_extent_cache();

	if (err)

		goto free_recovery_cache;

	err = f2fs_init_sysfs();

	if (err)

		goto free_extent_cache;
@@ -3335,6 +3338,8 @@ static int __init init_f2fs_fs(void) 
	f2fs_exit_sysfs();

free_extent_cache:

	f2fs_destroy_extent_cache();

free_recovery_cache:

	f2fs_destroy_recovery_cache();

free_checkpoint_caches:

	f2fs_destroy_checkpoint_caches();

free_segment_manager_caches:
@@ -3355,6 +3360,7 @@ static void __exit exit_f2fs_fs(void) 
	unregister_shrinker(&f2fs_shrinker_info);

	f2fs_exit_sysfs();

	f2fs_destroy_extent_cache();

	f2fs_destroy_recovery_cache();

	f2fs_destroy_checkpoint_caches();

	f2fs_destroy_segment_manager_caches();

	f2fs_destroy_node_manager_caches();