| Message ID | 1534140369-11578-1-git-send-email-zhongjiang@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | btrfs:free-space-cache: remove unneeded NULL check before kfree | expand |
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 <zhongjiang@huawei.com> Reviewed-by: Nikolay Borisov <nborisov@suse.com> > --- > 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; > } > >
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 <zhongjiang@huawei.com> Added to misc-next, thanks.
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; }
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 <zhongjiang@huawei.com> --- fs/btrfs/free-space-cache.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)