Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34802f23 authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

f2fs: avoid naming confusion of sysfs init 



This patch changes the function names of sysfs init to follow ext4.

f2fs_init_sysfs <-> f2fs_register_sysfs
f2fs_exit_sysfs <-> f2fs_unregister_sysfs

Suggested-by: default avatarChao Yu <yuchao0@huawei.com>
Reivewed-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 664265d8

fs/f2fs/f2fs.h

+4 −4
Original line number Diff line number Diff line
@@ -2938,10 +2938,10 @@ void destroy_extent_cache(void); 
/*

 * sysfs.c

 */

int __init f2fs_register_sysfs(void);

void f2fs_unregister_sysfs(void);

int f2fs_init_sysfs(struct f2fs_sb_info *sbi);

void f2fs_exit_sysfs(struct f2fs_sb_info *sbi);

int __init f2fs_init_sysfs(void);

void f2fs_exit_sysfs(void);

int f2fs_register_sysfs(struct f2fs_sb_info *sbi);

void f2fs_unregister_sysfs(struct f2fs_sb_info *sbi);



/*

 * crypto support

fs/f2fs/super.c

+6 −6
Original line number Diff line number Diff line
@@ -640,7 +640,7 @@ static void f2fs_put_super(struct super_block *sb) 


	kfree(sbi->ckpt);



	f2fs_exit_sysfs(sbi);

	f2fs_unregister_sysfs(sbi);



	sb->s_fs_info = NULL;

	if (sbi->s_chksum_driver)
@@ -2137,7 +2137,7 @@ try_onemore: 
		goto free_root_inode;

	}



	err = f2fs_init_sysfs(sbi);

	err = f2fs_register_sysfs(sbi);

	if (err)

		goto free_root_inode;
@@ -2208,7 +2208,7 @@ skip_recovery: 


free_sysfs:

	f2fs_sync_inode_meta(sbi);

	f2fs_exit_sysfs(sbi);

	f2fs_unregister_sysfs(sbi);

free_root_inode:

	dput(sb->s_root);

	sb->s_root = NULL;
@@ -2326,7 +2326,7 @@ static int __init init_f2fs_fs(void) 
	err = create_extent_cache();

	if (err)

		goto free_checkpoint_caches;

	err = f2fs_register_sysfs();

	err = f2fs_init_sysfs();

	if (err)

		goto free_extent_cache;

	err = register_shrinker(&f2fs_shrinker_info);
@@ -2345,7 +2345,7 @@ free_filesystem: 
free_shrinker:

	unregister_shrinker(&f2fs_shrinker_info);

free_sysfs:

	f2fs_unregister_sysfs();

	f2fs_exit_sysfs();

free_extent_cache:

	destroy_extent_cache();

free_checkpoint_caches:
@@ -2365,7 +2365,7 @@ static void __exit exit_f2fs_fs(void) 
	f2fs_destroy_root_stats();

	unregister_filesystem(&f2fs_fs_type);

	unregister_shrinker(&f2fs_shrinker_info);

	f2fs_unregister_sysfs();

	f2fs_exit_sysfs();

	destroy_extent_cache();

	destroy_checkpoint_caches();

	destroy_segment_manager_caches();

fs/f2fs/sysfs.c

+4 −4
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ static const struct file_operations f2fs_seq_##_name##_fops = { \ 
F2FS_PROC_FILE_DEF(segment_info);

F2FS_PROC_FILE_DEF(segment_bits);



int __init f2fs_register_sysfs(void)

int __init f2fs_init_sysfs(void)

{

	f2fs_proc_root = proc_mkdir("fs/f2fs", NULL);
@@ -314,13 +314,13 @@ int __init f2fs_register_sysfs(void) 
	return 0;

}



void f2fs_unregister_sysfs(void)

void f2fs_exit_sysfs(void)

{

	kset_unregister(f2fs_kset);

	remove_proc_entry("fs/f2fs", NULL);

}



int f2fs_init_sysfs(struct f2fs_sb_info *sbi)

int f2fs_register_sysfs(struct f2fs_sb_info *sbi)

{

	struct super_block *sb = sbi->sb;

	int err;
@@ -351,7 +351,7 @@ err_out: 
	return err;

}



void f2fs_exit_sysfs(struct f2fs_sb_info *sbi)

void f2fs_unregister_sysfs(struct f2fs_sb_info *sbi)

{

	kobject_del(&sbi->s_kobj);

	kobject_put(&sbi->s_kobj);