From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933630AbcIOD1S (ORCPT ); Wed, 14 Sep 2016 23:27:18 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:36422 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761983AbcIOD0a (ORCPT ); Wed, 14 Sep 2016 23:26:30 -0400 From: Wei Yongjun To: Markus Pargmann , Josef Bacik Cc: Wei Yongjun , nbd-general@lists.sourceforge.net, linux-kernel@vger.kernel.org Subject: [PATCH -next] nbd: fix return value check Date: Thu, 15 Sep 2016 03:26:23 +0000 Message-Id: <1473909983-30866-1-git-send-email-weiyj.lk@gmail.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wei Yongjun In case of error, the function blk_mq_alloc_request() or blk_mq_init_queue() returns ERR_PTR() not NULL. The NULL test in the return value check should be replaced with IS_ERR(). Fixes: fd8383fd88a2 ("nbd: convert to blkmq") Signed-off-by: Wei Yongjun --- drivers/block/nbd.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index 4c6dd1a..62ff9cb 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -599,8 +599,8 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd, return -EINVAL; sreq = blk_mq_alloc_request(bdev_get_queue(bdev), WRITE, 0); - if (!sreq) - return -ENOMEM; + if (IS_ERR(sreq)) + return PTR_ERR(sreq); mutex_unlock(&nbd->tx_lock); fsync_bdev(bdev); @@ -956,7 +956,8 @@ static int __init nbd_init(void) * These structs are big so we dynamically allocate them. */ disk->queue = blk_mq_init_queue(&nbd_dev[i].tag_set); - if (!disk->queue) { + if (IS_ERR(disk->queue)) { + err = PTR_ERR(disk->queue); blk_mq_free_tag_set(&nbd_dev[i].tag_set); put_disk(disk); goto out;