Re: [f2fs-dev] [PATCH] f2fs: avoid the global name 'fault_name'

[Chao Yu]

On 2018/7/1 0:06, Gao Xiang wrote:
> 
> Oh, I just found the same patch written by Chao at:
> https://git.kernel.org/pub/scm/linux/kernel/git/chao/linux.git/commit/?h=f2fs-dev
> 
> I just fixed the erofs name conflicts, so fixed f2fs as well.
> Please ignore this one.

I didn't send it out, I think merging yours will be fine to me. :)

Thanks,

> 
> Thanks, 
> Gao Xiang
> 
> On 2018/6/30 23:57, Gao Xiang wrote:
>> 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@xxxxxxxxxx>
>> To: Chao Yu <yuchao0@xxxxxxxxxx>
>> Cc: linux-f2fs-devel@xxxxxxxxxxxxxxxxxxxxx
>> Cc: linux-kernel@xxxxxxxxxxxxxxx
>> Reported-by: kbuild test robot <lkp@xxxxxxxxx>
>> Signed-off-by: Gao Xiang <gaoxiang25@xxxxxxxxxx>
>> ---
>>  fs/f2fs/f2fs.h  | 4 ++--
>>  fs/f2fs/super.c | 2 +-
>>  2 files changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
>> index 4d8b1de..11a2e09 100644
>> --- a/fs/f2fs/f2fs.h
>> +++ b/fs/f2fs/f2fs.h
>> @@ -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
>>  
>> @@ -1279,7 +1279,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)
>>  {
>> diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
>> index 3995e92..df12dcd 100644
>> --- a/fs/f2fs/super.c
>> +++ b/fs/f2fs/super.c
>> @@ -41,7 +41,7 @@
>>  
>>  #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",
>>
> 
> ------------------------------------------------------------------------------
> Check out the vibrant tech community on one of the world's most
> engaging tech sites, Slashdot.org! http://sdm.link/slashdot
> _______________________________________________
> Linux-f2fs-devel mailing list
> Linux-f2fs-devel@xxxxxxxxxxxxxxxxxxxxx
> https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
>