2022-06-02 08:04:01

by CGEL

Subject: [PATCH] gfs2: Remove redundant NULL check before kfree

From: Minghao Chi <[email protected]>

kfree on NULL pointer is a no-op.

Reported-by: Zeal Robot <[email protected]>
Signed-off-by: Minghao Chi <[email protected]>
---
fs/gfs2/file.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c
index 2cceb193dcd8..d8f1239344c1 100644
--- a/fs/gfs2/file.c
+++ b/fs/gfs2/file.c
@@ -1066,8 +1066,7 @@ static ssize_t gfs2_file_buffered_write(struct kiocb *iocb,
gfs2_glock_dq(gh);
out_uninit:
gfs2_holder_uninit(gh);
- if (statfs_gh)
- kfree(statfs_gh);
+ kfree(statfs_gh);
from->count = orig_count - written;
return written ? written : ret;
}
--
2.25.1

2022-06-02 10:29:09

by Andreas Gruenbacher

Subject: Re: [PATCH] gfs2: Remove redundant NULL check before kfree

On Thu, Jun 2, 2022 at 9:19 AM <[email protected]> wrote:
> From: Minghao Chi <[email protected]>
>
> kfree on NULL pointer is a no-op.
>
> Reported-by: Zeal Robot <[email protected]>
> Signed-off-by: Minghao Chi <[email protected]>
> ---
> fs/gfs2/file.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c
> index 2cceb193dcd8..d8f1239344c1 100644
> --- a/fs/gfs2/file.c
> +++ b/fs/gfs2/file.c
> @@ -1066,8 +1066,7 @@ static ssize_t gfs2_file_buffered_write(struct kiocb *iocb,
> gfs2_glock_dq(gh);
> out_uninit:
> gfs2_holder_uninit(gh);
> - if (statfs_gh)
> - kfree(statfs_gh);
> + kfree(statfs_gh);
> from->count = orig_count - written;
> return written ? written : ret;
> }
> --
> 2.25.1
>

Added to for-next, thanks.

Andreas