2018-08-13 06:19:05

by zhong jiang

Subject: [PATCH] btrfs:free-space-cache: remove unneeded NULL check before kfree

Kfree has taken the null pointer into account. So remove the check
before kfree.

The issue is detected with the help of Coccinelle.

Signed-off-by: zhong jiang <[email protected]>
---
fs/btrfs/free-space-cache.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
index c3888c1..69d639f 100644
--- a/fs/btrfs/free-space-cache.c
+++ b/fs/btrfs/free-space-cache.c
@@ -2110,8 +2110,7 @@ static int insert_into_bitmap(struct btrfs_free_space_ctl *ctl,

out:
if (info) {
- if (info->bitmap)
- kfree(info->bitmap);
+ kfree(info->bitmap);
kmem_cache_free(btrfs_free_space_cachep, info);
}

@@ -3605,8 +3604,7 @@ int test_add_free_space_entry(struct btrfs_block_group_cache *cache,

if (info)
kmem_cache_free(btrfs_free_space_cachep, info);
- if (map)
- kfree(map);
+ kfree(map);
return 0;
}

--
1.7.12.4

2018-08-13 07:03:30

by Nikolay Borisov

Subject: Re: [PATCH] btrfs:free-space-cache: remove unneeded NULL check before kfree

On 13.08.2018 09:06, zhong jiang wrote:
> Kfree has taken the null pointer into account. So remove the check
> before kfree.
>
> The issue is detected with the help of Coccinelle.
>
> Signed-off-by: zhong jiang <[email protected]>

Reviewed-by: Nikolay Borisov <[email protected]>

> ---
> fs/btrfs/free-space-cache.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
> index c3888c1..69d639f 100644
> --- a/fs/btrfs/free-space-cache.c
> +++ b/fs/btrfs/free-space-cache.c
> @@ -2110,8 +2110,7 @@ static int insert_into_bitmap(struct btrfs_free_space_ctl *ctl,
>
> out:
> if (info) {
> - if (info->bitmap)
> - kfree(info->bitmap);
> + kfree(info->bitmap);
> kmem_cache_free(btrfs_free_space_cachep, info);
> }
>
> @@ -3605,8 +3604,7 @@ int test_add_free_space_entry(struct btrfs_block_group_cache *cache,
>
> if (info)
> kmem_cache_free(btrfs_free_space_cachep, info);
> - if (map)
> - kfree(map);
> + kfree(map);
> return 0;
> }
>
>

2018-08-15 11:52:58

by David Sterba

Subject: Re: [PATCH] btrfs:free-space-cache: remove unneeded NULL check before kfree

On Mon, Aug 13, 2018 at 02:06:08PM +0800, zhong jiang wrote:
> Kfree has taken the null pointer into account. So remove the check
> before kfree.
>
> The issue is detected with the help of Coccinelle.
>
> Signed-off-by: zhong jiang <[email protected]>

Added to misc-next, thanks.