openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Jianpeng Ma <majianpeng@gmail.com>
Signed-off-by: Namjae Jeon <namjae.jeon@samsung.com>
Signed-off-by: Amit Sahrawat <a.sahrawat@samsung.com>
Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
This commit is contained in:
Namjae Jeon 2013-01-15 19:58:47 +09:00 committed by Jaegeuk Kim
parent 66af62ce75
commit 4589d25d01
3 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
fs/f2fs/debug.c
View File

@ -300,7 +300,7 @@ static const struct file_operations stat_fops = {
.release = single_release, .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_super_block *raw_super = F2FS_RAW_SUPER(sbi);
struct f2fs_stat_info *si; struct f2fs_stat_info *si;
@ -327,21 +327,6 @@ static int init_stats(struct f2fs_sb_info *sbi)
return 0; 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) void f2fs_destroy_stats(struct f2fs_sb_info *sbi)
{ {
struct f2fs_stat_info *si = sbi->stat_info; 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); 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_remove_recursive(debugfs_root);
debugfs_root = NULL; debugfs_root = NULL;

6
fs/f2fs/f2fs.h
View File

@ -1060,7 +1060,8 @@ struct f2fs_stat_info {
int f2fs_build_stats(struct f2fs_sb_info *); int f2fs_build_stats(struct f2fs_sb_info *);
void f2fs_destroy_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 #else
#define stat_inc_call_count(si) #define stat_inc_call_count(si)
#define stat_inc_seg_count(si, type) #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 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 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 #endif
extern const struct file_operations f2fs_dir_operations; extern const struct file_operations f2fs_dir_operations;

7
fs/f2fs/super.c
View File

@ -675,14 +675,17 @@ static int __init init_f2fs_fs(void)
err = create_checkpoint_caches(); err = create_checkpoint_caches();
if (err) if (err)
goto fail; goto fail;
return register_filesystem(&f2fs_fs_type); err = register_filesystem(&f2fs_fs_type);
if (err)
goto fail;
f2fs_create_root_stats();
fail: fail:
return err; return err;
} }
static void __exit exit_f2fs_fs(void) static void __exit exit_f2fs_fs(void)
{ {
destroy_root_stats(); f2fs_destroy_root_stats();
unregister_filesystem(&f2fs_fs_type); unregister_filesystem(&f2fs_fs_type);
destroy_checkpoint_caches(); destroy_checkpoint_caches();
destroy_gc_caches(); destroy_gc_caches();