blk-mq: Fix failed allocation path when mapping queues

[mirror_ubuntu-artful-kernel.git] / block / blk-zoned.c

diff --git a/block/blk-zoned.c b/block/blk-zoned.c
index 667f95d8669590642aae4b9cb127394db349e4f9..472211fa183a6488ef93676a2f89b2f345947c9a 100644 (file)
--- a/block/blk-zoned.c
+++ b/block/blk-zoned.c
@@ -80,7 +80,7 @@ int blkdev_report_zones(struct block_device *bdev,
        unsigned int i, n, nz;
        unsigned int ofst;
        void *addr;
-       int ret = 0;
+       int ret;
 
        if (!q)
                return -ENXIO;
@@ -179,14 +179,12 @@ int blkdev_report_zones(struct block_device *bdev,
 
        }
 
+       *nr_zones = nz;
 out:
        bio_for_each_segment_all(bv, bio, i)
                __free_page(bv->bv_page);
        bio_put(bio);
 
-       if (ret == 0)
-               *nr_zones = nz;
-
        return ret;
 }
 EXPORT_SYMBOL_GPL(blkdev_report_zones);