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

Commit 2d3a5856 authored by Gao Xiang's avatar Gao Xiang Committed by Jaegeuk Kim
Browse files

f2fs: avoid the global name 'fault_name' 

Non-prefix global name 'fault_name' will pollute global
namespace, fix it.

Refer to:
https://lists.01.org/pipermail/kbuild-all/2018-June/049660.html



To: Jaegeuk Kim <jaegeuk@kernel.org>
To: Chao Yu <yuchao0@huawei.com>
Cc: linux-f2fs-devel@lists.sourceforge.net
Cc: linux-kernel@vger.kernel.org
Reported-by: default avatarkbuild test robot <lkp@intel.com>
Signed-off-by: default avatarGao Xiang <gaoxiang25@huawei.com>
Reviewed-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 4dbe38dc

fs/f2fs/f2fs.h

+2 −2
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ struct f2fs_fault_info { 
	unsigned int inject_type;

};



extern char *fault_name[FAULT_MAX];

extern char *f2fs_fault_name[FAULT_MAX];

#define IS_FAULT_SET(fi, type) ((fi)->inject_type & (1 << (type)))

#endif
@@ -1283,7 +1283,7 @@ struct f2fs_sb_info { 
#ifdef CONFIG_F2FS_FAULT_INJECTION

#define f2fs_show_injection_info(type)				\

	printk("%sF2FS-fs : inject %s in %s of %pF\n",		\

		KERN_INFO, fault_name[type],			\

		KERN_INFO, f2fs_fault_name[type],		\

		__func__, __builtin_return_address(0))

static inline bool time_to_inject(struct f2fs_sb_info *sbi, int type)

{

fs/f2fs/super.c

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ static struct kmem_cache *f2fs_inode_cachep; 


#ifdef CONFIG_F2FS_FAULT_INJECTION



char *fault_name[FAULT_MAX] = {

char *f2fs_fault_name[FAULT_MAX] = {

	[FAULT_KMALLOC]		= "kmalloc",

	[FAULT_KVMALLOC]	= "kvmalloc",

	[FAULT_PAGE_ALLOC]	= "page alloc",