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

Commit 4589d25d authored by Namjae Jeon's avatar Namjae Jeon Committed by Jaegeuk Kim
Browse files

f2fs: fix the debugfs entry creation path 



As the "status" debugfs entry will be maintained for entire F2FS filesystem
irrespective of the number of partitions.
So, we can move the initialization to the init part of the f2fs and destroy will
be done from exit part. After making changes, for individual partition mount -
entry creation code will not be executed.

Signed-off-by: default avatarJianpeng Ma <majianpeng@gmail.com>
Signed-off-by: default avatarNamjae Jeon <namjae.jeon@samsung.com>
Signed-off-by: default avatarAmit Sahrawat <a.sahrawat@samsung.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>
parent 66af62ce

fs/f2fs/debug.c

+10 −17
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ static const struct file_operations stat_fops = { 
	.release = single_release,

};



static int init_stats(struct f2fs_sb_info *sbi)

int f2fs_build_stats(struct f2fs_sb_info *sbi)

{

	struct f2fs_super_block *raw_super = F2FS_RAW_SUPER(sbi);

	struct f2fs_stat_info *si;
@@ -327,21 +327,6 @@ static int init_stats(struct f2fs_sb_info *sbi) 
	return 0;

}



int f2fs_build_stats(struct f2fs_sb_info *sbi)

{

	int retval;



	retval = init_stats(sbi);

	if (retval)

		return retval;



	if (!debugfs_root)

		debugfs_root = debugfs_create_dir("f2fs", NULL);



	debugfs_create_file("status", S_IRUGO, debugfs_root, NULL, &stat_fops);

	return 0;

}



void f2fs_destroy_stats(struct f2fs_sb_info *sbi)

{

	struct f2fs_stat_info *si = sbi->stat_info;
@@ -353,7 +338,15 @@ void f2fs_destroy_stats(struct f2fs_sb_info *sbi) 
	kfree(sbi->stat_info);

}



void destroy_root_stats(void)

void __init f2fs_create_root_stats(void)

{

	debugfs_root = debugfs_create_dir("f2fs", NULL);

	if (debugfs_root)

		debugfs_create_file("status", S_IRUGO, debugfs_root,

					 NULL, &stat_fops);

}



void f2fs_destroy_root_stats(void)

{

	debugfs_remove_recursive(debugfs_root);

	debugfs_root = NULL;

fs/f2fs/f2fs.h

+4 −2
Original line number Diff line number Diff line
@@ -1060,7 +1060,8 @@ struct f2fs_stat_info { 


int f2fs_build_stats(struct f2fs_sb_info *);

void f2fs_destroy_stats(struct f2fs_sb_info *);

void destroy_root_stats(void);

void f2fs_create_root_stats(void);

void f2fs_destroy_root_stats(void);

#else

#define stat_inc_call_count(si)

#define stat_inc_seg_count(si, type)
@@ -1070,7 +1071,8 @@ void destroy_root_stats(void); 


static inline int f2fs_build_stats(struct f2fs_sb_info *sbi) { return 0; }

static inline void f2fs_destroy_stats(struct f2fs_sb_info *sbi) { }

static inline void destroy_root_stats(void) { }

static inline void f2fs_create_root_stats(void) { }

static inline void f2fs_destroy_root_stats(void) { }

#endif



extern const struct file_operations f2fs_dir_operations;

fs/f2fs/super.c

+5 −2
Original line number Diff line number Diff line
@@ -675,14 +675,17 @@ static int __init init_f2fs_fs(void) 
	err = create_checkpoint_caches();

	if (err)

		goto fail;

	return register_filesystem(&f2fs_fs_type);

	err = register_filesystem(&f2fs_fs_type);

	if (err)

		goto fail;

	f2fs_create_root_stats();

fail:

	return err;

}



static void __exit exit_f2fs_fs(void)

{

	destroy_root_stats();

	f2fs_destroy_root_stats();

	unregister_filesystem(&f2fs_fs_type);

	destroy_checkpoint_caches();

	destroy_gc_caches();