[v1] nfs: Remove unnecessary NULL check before kfree()

[RESEND PATCH] nfs: Remove unnecessary NULL check before kfree()

Posted by Thorsten Blum 2 months, 2 weeks ago

Since kfree() already checks if its argument is NULL, an additional
check before calling kfree() is unnecessary and can be removed.

Remove it and thus also the following Coccinelle/coccicheck warning
reported by ifnullfree.cocci:

  WARNING: NULL check before some freeing functions is not needed

Reviewed-by: Benjamin Coddington <bcodding@redhat.com>
Signed-off-by: Thorsten Blum <thorsten.blum@toblux.com>
---
 fs/nfs/read.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fs/nfs/read.c b/fs/nfs/read.c
index a6103333b666..81bd1b9aba17 100644
--- a/fs/nfs/read.c
+++ b/fs/nfs/read.c
@@ -48,8 +48,7 @@ static struct nfs_pgio_header *nfs_readhdr_alloc(void)
 
 static void nfs_readhdr_free(struct nfs_pgio_header *rhdr)
 {
-	if (rhdr->res.scratch != NULL)
-		kfree(rhdr->res.scratch);
+	kfree(rhdr->res.scratch);
 	kmem_cache_free(nfs_rdata_cachep, rhdr);
 }
 
-- 
2.46.0

Re: [RESEND PATCH] nfs: Remove unnecessary NULL check before kfree()

Posted by Jeff Layton 2 months, 2 weeks ago

On Tue, 2024-09-10 at 12:42 +0200, Thorsten Blum wrote:
> Since kfree() already checks if its argument is NULL, an additional
> check before calling kfree() is unnecessary and can be removed.
> 
> Remove it and thus also the following Coccinelle/coccicheck warning
> reported by ifnullfree.cocci:
> 
>   WARNING: NULL check before some freeing functions is not needed
> 
> Reviewed-by: Benjamin Coddington <bcodding@redhat.com>
> Signed-off-by: Thorsten Blum <thorsten.blum@toblux.com>
> ---
>  fs/nfs/read.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/fs/nfs/read.c b/fs/nfs/read.c
> index a6103333b666..81bd1b9aba17 100644
> --- a/fs/nfs/read.c
> +++ b/fs/nfs/read.c
> @@ -48,8 +48,7 @@ static struct nfs_pgio_header *nfs_readhdr_alloc(void)
>  
>  static void nfs_readhdr_free(struct nfs_pgio_header *rhdr)
>  {
> -	if (rhdr->res.scratch != NULL)
> -		kfree(rhdr->res.scratch);
> +	kfree(rhdr->res.scratch);
>  	kmem_cache_free(nfs_rdata_cachep, rhdr);
>  }
>  

Reviewed-by: Jeff Layton <jlayton@kernel.org>