Re: [PATCH v2] staging:erofs: Fix alignment issues

[Gao Xiang <gaoxiang25@huawei.com>]

On 2018/12/12 20:11, Gao Xiang wrote:
> Hi Aaron,
> 
> On 2018/12/12 20:00, Aaron Strahlberger wrote:
>> Fix of `CHECK: Alignment should match open parenthesis` issues, reported by
>> checkpatch.pl
>>
>> Signed-off-by: Aaron Strahlberger <aaron.strahlberger@posteo.de>
>> Signed-off-by: Julius Wiedmann <julius.wiedmann@fau.de>
>> Signed-off-by: Dominik Huber <domi250@gmx.de>
>> ---
>>  drivers/staging/erofs/dir.c | 12 ++++++------
>>  1 file changed, 6 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/staging/erofs/dir.c b/drivers/staging/erofs/dir.c
>> index e44ca93dcdc6..e1955703ab8f 100644
>> --- a/drivers/staging/erofs/dir.c
>> +++ b/drivers/staging/erofs/dir.c
>> @@ -24,8 +24,8 @@ static const unsigned char erofs_filetype_table[EROFS_FT_MAX] = {
>>  };
>>  
>>  static int erofs_fill_dentries(struct dir_context *ctx,
>> -	void *dentry_blk, unsigned int *ofs,
>> -	unsigned int nameoff, unsigned int maxsize)
>> +			       void *dentry_blk, unsigned int *ofs,
>> +			       unsigned int nameoff, unsigned int maxsize)
>>  {
>>  	struct erofs_dirent *de = dentry_blk;
>>  	const struct erofs_dirent *end = dentry_blk + nameoff;
>> @@ -69,8 +69,8 @@ static int erofs_fill_dentries(struct dir_context *ctx,
>>  #endif
>>  
>>  		if (!dir_emit(ctx, de_name, de_namelen,
>> -					le64_to_cpu(de->nid), d_type))
>> -			/* stoped by some reason */
>> +			      le64_to_cpu(de->nid), d_type))
>> +			/* stopped by some reason */
> It seems Greg has merged part of your previous patch,
> https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git/commit/drivers/staging/erofs?h=staging-testing&id=019ec6c14fbdfaeb361c84f68158fb9097f41004
> 
> Anyway, I can locally apply it by 3-way merge, and it looks good to me apart from that
> 
> Reviewed-by: Gao Xiang <gaoxiang25@huawei.com>
> 

By the way, the subject line could be better as "staging: erofs: Fix alignment issues" rather than "staging:erofs: Fix alignment issues"

Thanks,
Gao Xiang

> Thanks,
> Gao Xiang
>