[PATCH 3/7] staging: erofs: introduce a new helper __erofs_build_fault_attr()

[cgxu519]

On 09/12/2018 07:22 PM, Gao Xiang wrote:
> Hi Chengguang,
>
> On 2018/9/12 13:10, Chengguang Xu wrote:
>> Introduce a new helper __erofs_build_fault_attr() to handle set/clear
>> erofs_fault_info, we need this funciton for internal use case.
>> for example, reset fault_injection option in remount.
>>
>> Signed-off-by: Chengguang Xu <cgxu519 at gmx.com>
>> ---
>>   drivers/staging/erofs/super.c | 26 ++++++++++++++++++--------
>>   1 file changed, 18 insertions(+), 8 deletions(-)
>>
>> diff --git a/drivers/staging/erofs/super.c b/drivers/staging/erofs/super.c
>> index 14dbb6517b8d..d2dbc1fd3abb 100644
>> --- a/drivers/staging/erofs/super.c
>> +++ b/drivers/staging/erofs/super.c
>> @@ -144,15 +144,9 @@ char *erofs_fault_name[FAULT_MAX] = {
>>   	[FAULT_KMALLOC]		= "kmalloc",
>>   };
>>   
>> -static int erofs_build_fault_attr(struct erofs_sb_info *sbi,
>> -					substring_t *args)
>> +static void __erofs_build_fault_attr(struct erofs_sb_info *sbi,
>> +					unsigned int rate)
>>   {
>> -	struct erofs_fault_info *ffi = &sbi->fault_info;
>> -	int rate = 0;
>> -
>> -	if (args->from && match_int(args, &rate))
>> -		return -EINVAL;
>> -
>>   	if (rate) {
> I get some compile error of this patch...
> drivers/staging/erofs/super.c: In function ‘__erofs_build_fault_attr’:
> drivers/staging/erofs/super.c:156:15: error: ‘ffi’ undeclared (first use in this function)
>     atomic_set(&ffi->inject_ops, 0);
>                 ^
> drivers/staging/erofs/super.c:156:15: note: each undeclared identifier is reported only once for each function it appears in
> drivers/staging/erofs/super.c: In function ‘erofs_build_fault_attr’:
> drivers/staging/erofs/super.c:169:27: warning: unused variable ‘ffi’ [-Wunused-variable]
>    struct erofs_fault_info *ffi = &sbi->fault_info;
Sorry for that, I'll fix it in rebased version.

>
> p.s. could you please rebase your patch on Thomas's [PATCH v4] staging: erofs: use explicit unsigned int type ?
> since I'm rebasing the rest PREVIEW patches on this commit now.

I noticed Thomas' patch had already committed to erofs-master branch in 
Chao's linux git repo, also my
previous patch but not in erofs-dev branch. So should I rebase on 
erofs-master?
Could you give me a little more guide for it?
>
> p.p.s. I'd like to get Chao's idea of this fault injection patchset first :)
No problem, let's wait for a while, then I'll rebase the code according 
to the comments.


Thanks,
Chengguang