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

Commit 6f6bdf44 authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: clean up sysfs codes 



commit a398101aa113351ec973e9e6a3208c7160b7b1fc upstream.

Just cleanup.

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

fs/f2fs/super.c

+74 −47
Original line number Diff line number Diff line
@@ -345,6 +345,22 @@ static struct kobj_type f2fs_ktype = { 
	.release	= f2fs_sb_release,

};



int __init f2fs_register_sysfs(void)

{

	f2fs_proc_root = proc_mkdir("fs/f2fs", NULL);



	f2fs_kset = kset_create_and_add("f2fs", NULL, fs_kobj);

	if (!f2fs_kset)

		return -ENOMEM;

	return 0;

}



void f2fs_unregister_sysfs(void)

{

	kset_unregister(f2fs_kset);

	remove_proc_entry("fs/f2fs", NULL);

}



void f2fs_msg(struct super_block *sb, const char *level, const char *fmt, ...)

{

	struct va_format vaf;
@@ -753,17 +769,23 @@ static void destroy_device_list(struct f2fs_sb_info *sbi) 
	kfree(sbi->devs);

}



static void f2fs_put_super(struct super_block *sb)

void f2fs_exit_sysfs(struct f2fs_sb_info *sbi)

{

	struct f2fs_sb_info *sbi = F2FS_SB(sb);

	int i;

	kobject_del(&sbi->s_kobj);

	kobject_put(&sbi->s_kobj);

	wait_for_completion(&sbi->s_kobj_unregister);



	if (sbi->s_proc) {

		remove_proc_entry("segment_info", sbi->s_proc);

		remove_proc_entry("segment_bits", sbi->s_proc);

		remove_proc_entry(sb->s_id, f2fs_proc_root);

		remove_proc_entry(sbi->sb->s_id, f2fs_proc_root);

	}

}

	kobject_del(&sbi->s_kobj);



static void f2fs_put_super(struct super_block *sb)

{

	struct f2fs_sb_info *sbi = F2FS_SB(sb);

	int i;



	stop_gc_thread(sbi);
@@ -816,8 +838,8 @@ static void f2fs_put_super(struct super_block *sb) 
	destroy_segment_manager(sbi);



	kfree(sbi->ckpt);

	kobject_put(&sbi->s_kobj);

	wait_for_completion(&sbi->s_kobj_unregister);



	f2fs_exit_sysfs(sbi);



	sb->s_fs_info = NULL;

	if (sbi->s_chksum_driver)
@@ -1047,6 +1069,37 @@ static const struct file_operations f2fs_seq_##_name##_fops = { \ 
F2FS_PROC_FILE_DEF(segment_info);

F2FS_PROC_FILE_DEF(segment_bits);



int f2fs_init_sysfs(struct f2fs_sb_info *sbi)

{

	struct super_block *sb = sbi->sb;

	int err;



	if (f2fs_proc_root)

		sbi->s_proc = proc_mkdir(sb->s_id, f2fs_proc_root);



	if (sbi->s_proc) {

		proc_create_data("segment_info", S_IRUGO, sbi->s_proc,

				 &f2fs_seq_segment_info_fops, sb);

		proc_create_data("segment_bits", S_IRUGO, sbi->s_proc,

				 &f2fs_seq_segment_bits_fops, sb);

	}



	sbi->s_kobj.kset = f2fs_kset;

	init_completion(&sbi->s_kobj_unregister);

	err = kobject_init_and_add(&sbi->s_kobj, &f2fs_ktype, NULL,

							"%s", sb->s_id);

	if (err)

		goto err_out;

	return 0;

err_out:

	if (sbi->s_proc) {

		remove_proc_entry("segment_info", sbi->s_proc);

		remove_proc_entry("segment_bits", sbi->s_proc);

		remove_proc_entry(sb->s_id, f2fs_proc_root);

	}

	return err;

}



static void default_options(struct f2fs_sb_info *sbi)

{

	/* init some FS parameters */
@@ -2108,22 +2161,9 @@ try_onemore: 
		goto free_root_inode;

	}



	if (f2fs_proc_root)

		sbi->s_proc = proc_mkdir(sb->s_id, f2fs_proc_root);



	if (sbi->s_proc) {

		proc_create_data("segment_info", S_IRUGO, sbi->s_proc,

				 &f2fs_seq_segment_info_fops, sb);

		proc_create_data("segment_bits", S_IRUGO, sbi->s_proc,

				 &f2fs_seq_segment_bits_fops, sb);

	}



	sbi->s_kobj.kset = f2fs_kset;

	init_completion(&sbi->s_kobj_unregister);

	err = kobject_init_and_add(&sbi->s_kobj, &f2fs_ktype, NULL,

							"%s", sb->s_id);

	err = f2fs_init_sysfs(sbi);

	if (err)

		goto free_proc;

		goto free_root_inode;



	/* recover fsynced data */

	if (!test_opt(sbi, DISABLE_ROLL_FORWARD)) {
@@ -2134,7 +2174,7 @@ try_onemore: 
		if (bdev_read_only(sb->s_bdev) &&

				!is_set_ckpt_flags(sbi, CP_UMOUNT_FLAG)) {

			err = -EROFS;

			goto free_kobj;

			goto free_sysfs;

		}



		if (need_fsck)
@@ -2148,7 +2188,7 @@ try_onemore: 
			need_fsck = true;

			f2fs_msg(sb, KERN_ERR,

				"Cannot recover all fsync data errno=%d", err);

			goto free_kobj;

			goto free_sysfs;

		}

	} else {

		err = recover_fsync_data(sbi, true);
@@ -2157,7 +2197,7 @@ try_onemore: 
			err = -EINVAL;

			f2fs_msg(sb, KERN_ERR,

				"Need to recover fsync data");

			goto free_kobj;

			goto free_sysfs;

		}

	}

skip_recovery:
@@ -2172,7 +2212,7 @@ skip_recovery: 
		/* After POR, we can run background GC thread.*/

		err = start_gc_thread(sbi);

		if (err)

			goto free_kobj;

			goto free_sysfs;

	}

	kfree(options);
@@ -2190,17 +2230,9 @@ skip_recovery: 
	f2fs_update_time(sbi, REQ_TIME);

	return 0;



free_kobj:

free_sysfs:

	f2fs_sync_inode_meta(sbi);

	kobject_del(&sbi->s_kobj);

	kobject_put(&sbi->s_kobj);

	wait_for_completion(&sbi->s_kobj_unregister);

free_proc:

	if (sbi->s_proc) {

		remove_proc_entry("segment_info", sbi->s_proc);

		remove_proc_entry("segment_bits", sbi->s_proc);

		remove_proc_entry(sb->s_id, f2fs_proc_root);

	}

	f2fs_exit_sysfs(sbi);

free_root_inode:

	dput(sb->s_root);

	sb->s_root = NULL;
@@ -2315,30 +2347,26 @@ static int __init init_f2fs_fs(void) 
	err = create_extent_cache();

	if (err)

		goto free_checkpoint_caches;

	f2fs_kset = kset_create_and_add("f2fs", NULL, fs_kobj);

	if (!f2fs_kset) {

		err = -ENOMEM;

	err = f2fs_register_sysfs();

	if (err)

		goto free_extent_cache;

	}

	err = register_shrinker(&f2fs_shrinker_info);

	if (err)

		goto free_kset;



		goto free_sysfs;

	err = register_filesystem(&f2fs_fs_type);

	if (err)

		goto free_shrinker;

	err = f2fs_create_root_stats();

	if (err)

		goto free_filesystem;

	f2fs_proc_root = proc_mkdir("fs/f2fs", NULL);

	return 0;



free_filesystem:

	unregister_filesystem(&f2fs_fs_type);

free_shrinker:

	unregister_shrinker(&f2fs_shrinker_info);

free_kset:

	kset_unregister(f2fs_kset);

free_sysfs:

	f2fs_unregister_sysfs();

free_extent_cache:

	destroy_extent_cache();

free_checkpoint_caches:
@@ -2355,11 +2383,10 @@ fail: 


static void __exit exit_f2fs_fs(void)

{

	remove_proc_entry("fs/f2fs", NULL);

	f2fs_destroy_root_stats();

	unregister_filesystem(&f2fs_fs_type);

	unregister_shrinker(&f2fs_shrinker_info);

	kset_unregister(f2fs_kset);

	f2fs_unregister_sysfs();

	destroy_extent_cache();

	destroy_checkpoint_caches();

	destroy_segment_manager_caches();