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

Commit 787c7b8c authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: report error of f2fs_create_root_stats 



f2fs_create_root_stats can fail due to no memory, report it to user.

Signed-off-by: default avatarChao Yu <chao2.yu@samsung.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent fb39cbda

fs/f2fs/debug.c

+5 −2
Original line number Diff line number Diff line
@@ -406,20 +406,23 @@ void f2fs_destroy_stats(struct f2fs_sb_info *sbi) 
	kfree(si);

}



void __init f2fs_create_root_stats(void)

int __init f2fs_create_root_stats(void)

{

	struct dentry *file;



	f2fs_debugfs_root = debugfs_create_dir("f2fs", NULL);

	if (!f2fs_debugfs_root)

		return;

		return -ENOMEM;



	file = debugfs_create_file("status", S_IRUGO, f2fs_debugfs_root,

			NULL, &stat_fops);

	if (!file) {

		debugfs_remove(f2fs_debugfs_root);

		f2fs_debugfs_root = NULL;

		return -ENOMEM;

	}



	return 0;

}



void f2fs_destroy_root_stats(void)

fs/f2fs/f2fs.h

+2 −2
Original line number Diff line number Diff line
@@ -1987,7 +1987,7 @@ static inline struct f2fs_stat_info *F2FS_STAT(struct f2fs_sb_info *sbi) 


int f2fs_build_stats(struct f2fs_sb_info *);

void f2fs_destroy_stats(struct f2fs_sb_info *);

void __init f2fs_create_root_stats(void);

int __init f2fs_create_root_stats(void);

void f2fs_destroy_root_stats(void);

#else

#define stat_inc_cp_count(si)
@@ -2015,7 +2015,7 @@ void f2fs_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 __init f2fs_create_root_stats(void) { }

static inline int __init f2fs_create_root_stats(void) { return 0; }

static inline void f2fs_destroy_root_stats(void) { }

#endif

fs/f2fs/super.c

+5 −1
Original line number Diff line number Diff line
@@ -1478,10 +1478,14 @@ static int __init init_f2fs_fs(void) 
	err = register_filesystem(&f2fs_fs_type);

	if (err)

		goto free_shrinker;

	f2fs_create_root_stats();

	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_crypto: