2018-08-28 07:32:11

by Ding Xiang

Subject: [PATCH] block: Fix unneeded NULL check

if icq_cache is null, kmem_cache_destroy will do nothing.
So, remove the null check.

Signed-off-by: Ding Xiang <[email protected]>
---
block/elevator.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/block/elevator.c b/block/elevator.c
index 5ea6e7d..6a06b5d 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -895,8 +895,7 @@ int elv_register(struct elevator_type *e)
spin_lock(&elv_list_lock);
if (elevator_find(e->elevator_name, e->uses_mq)) {
spin_unlock(&elv_list_lock);
- if (e->icq_cache)
- kmem_cache_destroy(e->icq_cache);
+ kmem_cache_destroy(e->icq_cache);
return -EBUSY;
}
list_add_tail(&e->list, &elv_list);
--
1.9.1

2018-08-28 14:40:18

by Jens Axboe

Subject: Re: [PATCH] block: Fix unneeded NULL check

On 8/28/18 1:30 AM, Ding Xiang wrote:
> if icq_cache is null, kmem_cache_destroy will do nothing.
> So, remove the null check.

Identical patch is already queued up:

http://git.kernel.dk/cgit/linux-block/commit/?h=for-linus&id=62d2a1940709198a522a43ff8be8b8f6b3654dec

--
Jens Axboe