From: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Date: Sun, 29 Mar 2020 10:08:26 -0600
Subject: [PATCH] block: return NULL in blk_alloc_queue() on error
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Git-commit: 654a3667df364f778b9b5bcdfb32e545aceb6a51
Patch-Mainline: v5.7-rc1
References: bsc#1175995,jsc#SLE-15608
This patch fixes follwoing warning:
block/blk-core.c: In function ‘blk_alloc_queue’:
block/blk-core.c:558:10: warning: returning ‘int’ from a function with return type ‘struct request_queue *’ makes pointer from integer without a cast [-Wint-conversion]
return -EINVAL;
Fixes: 3d745ea5b095a ("block: simplify queue allocation")
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Hannes Reinecke <hare@suse.de>
---
block/blk-core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/block/blk-core.c b/block/blk-core.c
index 18b8c09d093e..7e4a1da0715e 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -555,7 +555,7 @@ struct request_queue *blk_alloc_queue(make_request_fn make_request, int node_id)
struct request_queue *q;
if (WARN_ON_ONCE(!make_request))
- return -EINVAL;
+ return NULL;
q = __blk_alloc_queue(node_id);
if (!q)
--
2.16.4