summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>2016-10-30 05:28:27 +0100
committerJens Axboe <axboe@fb.com>2016-11-06 14:14:59 -0700
commit772918524dfb8c8869120728c1b1109a2d49493c (patch)
tree387018dd45b281964a3f1c64766b3efb98a784fc /drivers/block
parentbc33b0ca11e3df467777a4fa7639ba488c9d4911 (diff)
downloadlinux-772918524dfb8c8869120728c1b1109a2d49493c.tar.gz
linux-772918524dfb8c8869120728c1b1109a2d49493c.tar.bz2
linux-772918524dfb8c8869120728c1b1109a2d49493c.zip
nbd: Fix error handling
'blk_mq_alloc_request()' returns an error pointer in case of error, not NULL. So test it with IS_ERR. Fixes: fd8383fd88a2 ("nbd: convert to blkmq") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/nbd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 19a16b2dbb91..7a1048755914 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -599,7 +599,7 @@ 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)
+ if (IS_ERR(sreq))
return -ENOMEM;
mutex_unlock(&nbd->tx_lock);