blk-mq: fix an IS_ERR() vs NULL bug

PATCH Applied Dan Carpenter 4 participants 4 messages Jun 18, 2021 – Jun 19, 2021

Subsystems (2)

Block layer Kernel janitors

lore

Share & tools

lore

Dan Carpenter

author

2021-06-18 13:45 UTC #0 lore raw

PATCH 1/1 blk-mq: fix an IS_ERR() vs NULL bug

The __blk_mq_alloc_disk() function doesn't return NULLs it returns error pointers.

Fixes b461dfc49eb6 ("blk-mq: add the blk_mq_alloc_disk APIs")

Signed-off-by Dan Carpenter <[email protected]>

---
 include/linux/blk-mq.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

include/linux/blk-mq.h +1 -1

index 02a4aab0aeac..fd2de2b422ed 100644
@@ -431,7 +431,7 @@ enum {
 	static struct lock_class_key __key;				\
 	struct gendisk *__disk = __blk_mq_alloc_disk(set, queuedata);	\
 									\
-	if (__disk)							\
+	if (!IS_ERR(__disk))						\
 		lockdep_init_map(&__disk->lockdep_map,			\
 			"(bio completion)", &__key, 0);			\
 	__disk;								\

Signature · 1 line

2.30.2

Christoph Hellwig

Reviewed-by on v1 1/1

2021-06-18 14:07 UTC #1 lore raw

Quoted 5 lines · Dan Carpenter

The __blk_mq_alloc_disk() function doesn't return NULLs it returns error pointers.
Fixes b461dfc49eb6 ("blk-mq: add the blk_mq_alloc_disk APIs")
Signed-off-by Dan Carpenter <[email protected]>

Looks good,

Reviewed-by Christoph Hellwig <[email protected]>

Jens Axboe

maintainer Applied

2021-06-18 14:53 UTC #2 lore raw

In reply to Dan Carpenter

Quoted 2 lines · Dan Carpenter

The __blk_mq_alloc_disk() function doesn't return NULLs it returns error pointers.

Applied, thanks.

Signature · 1 line

Jens Axboe

Chaitanya Kulkarni

Reviewed-by on v1 1/1

2021-06-19 23:02 UTC #3 lore raw

In reply to Dan Carpenter

Quoted 5 lines · Dan Carpenter

The __blk_mq_alloc_disk() function doesn't return NULLs it returns error pointers.
Fixes b461dfc49eb6 ("blk-mq: add the blk_mq_alloc_disk APIs")
Signed-off-by Dan Carpenter <[email protected]>

Thanks for the fix, looks good.

Reviewed-by Chaitanya Kulkarni <[email protected]>