[RFC PATCH] xfs: remove unnecessary null check in xfs_generic_create

[RFC PATCH] xfs: remove unnecessary null check in xfs_generic_create

[xiakaixu1987]

From: Kaixu Xia <kaixuxia@tencent.com>

The function posix_acl_release() test the passed-in argument and
move on only when it is non-null, so maybe the null check in
xfs_generic_create is unnecessary.

Signed-off-by: Kaixu Xia <kaixuxia@tencent.com>
---
 fs/xfs/xfs_iops.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
index 5e165456da68..5907e999642c 100644
--- a/fs/xfs/xfs_iops.c
+++ b/fs/xfs/xfs_iops.c
@@ -206,10 +206,8 @@ xfs_generic_create(
 	xfs_finish_inode_setup(ip);
 
  out_free_acl:
-	if (default_acl)
-		posix_acl_release(default_acl);
-	if (acl)
-		posix_acl_release(acl);
+	posix_acl_release(default_acl);
+	posix_acl_release(acl);
 	return error;
 
  out_cleanup_inode:
-- 
2.20.0

Re: [RFC PATCH] xfs: remove unnecessary null check in xfs_generic_create

[Darrick J. Wong]

On Fri, Oct 09, 2020 at 04:29:10PM +0800, xiakaixu1987@gmail.com wrote:
> From: Kaixu Xia <kaixuxia@tencent.com>
> 
> The function posix_acl_release() test the passed-in argument and
> move on only when it is non-null, so maybe the null check in
> xfs_generic_create is unnecessary.
> 
> Signed-off-by: Kaixu Xia <kaixuxia@tencent.com>

Heh, yep.  Nice cleanup.
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>

--D

> ---
>  fs/xfs/xfs_iops.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
> index 5e165456da68..5907e999642c 100644
> --- a/fs/xfs/xfs_iops.c
> +++ b/fs/xfs/xfs_iops.c
> @@ -206,10 +206,8 @@ xfs_generic_create(
>  	xfs_finish_inode_setup(ip);
>  
>   out_free_acl:
> -	if (default_acl)
> -		posix_acl_release(default_acl);
> -	if (acl)
> -		posix_acl_release(acl);
> +	posix_acl_release(default_acl);
> +	posix_acl_release(acl);
>  	return error;
>  
>   out_cleanup_inode:
> -- 
> 2.20.0
> 

Re: [RFC PATCH] xfs: remove unnecessary null check in xfs_generic_create

[kaixuxia]

On 2020/10/9 23:45, Darrick J. Wong wrote:
> On Fri, Oct 09, 2020 at 04:29:10PM +0800, xiakaixu1987@gmail.com wrote:
>> From: Kaixu Xia <kaixuxia@tencent.com>
>>
>> The function posix_acl_release() test the passed-in argument and
>> move on only when it is non-null, so maybe the null check in
>> xfs_generic_create is unnecessary.
>>
>> Signed-off-by: Kaixu Xia <kaixuxia@tencent.com>
> 
> Heh, yep.  Nice cleanup.
> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>

Hi Darrick,

There are some patches that have been reviewed but not been merged
into xfs for-next branch, I will reply to them.
Sorry for the noise:)

Thanks,
Kaixu
> 
> --D
> 
>> ---
>>  fs/xfs/xfs_iops.c | 6 ++----
>>  1 file changed, 2 insertions(+), 4 deletions(-)
>>
>> diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
>> index 5e165456da68..5907e999642c 100644
>> --- a/fs/xfs/xfs_iops.c
>> +++ b/fs/xfs/xfs_iops.c
>> @@ -206,10 +206,8 @@ xfs_generic_create(
>>  	xfs_finish_inode_setup(ip);
>>  
>>   out_free_acl:
>> -	if (default_acl)
>> -		posix_acl_release(default_acl);
>> -	if (acl)
>> -		posix_acl_release(acl);
>> +	posix_acl_release(default_acl);
>> +	posix_acl_release(acl);
>>  	return error;
>>  
>>   out_cleanup_inode:
>> -- 
>> 2.20.0
>>

-- 
kaixuxia

Re: [RFC PATCH] xfs: remove unnecessary null check in xfs_generic_create

[Christoph Hellwig]

On Fri, Oct 09, 2020 at 04:29:10PM +0800, xiakaixu1987@gmail.com wrote:
> From: Kaixu Xia <kaixuxia@tencent.com>
> 
> The function posix_acl_release() test the passed-in argument and
> move on only when it is non-null, so maybe the null check in
> xfs_generic_create is unnecessary.
> 
> Signed-off-by: Kaixu Xia <kaixuxia@tencent.com>

Looks good,

Reviewed-by: Christoph Hellwig <hch@lst.de>