Merge branch 'for-4.8/core' of git://git.kernel.dk/linux-block

[karo-tx-linux.git] / block / blk-lib.c

diff --git a/block/blk-lib.c b/block/blk-lib.c
index ff2a7f04af4df84475e107e2d2d244da6739eb1e..9031d2af0b47c4210fe1db182545e1a806def18b 100644 (file)
--- a/block/blk-lib.c
+++ b/block/blk-lib.c
@@ -115,6 +115,7 @@ int blkdev_issue_discard(struct block_device *bdev, sector_t sector,
                ret = submit_bio_wait(bio);
                if (ret == -EOPNOTSUPP)
                        ret = 0;
+               bio_put(bio);
        }
        blk_finish_plug(&plug);
 
@@ -168,8 +169,10 @@ int blkdev_issue_write_same(struct block_device *bdev, sector_t sector,
                }
        }
 
-       if (bio)
+       if (bio) {
                ret = submit_bio_wait(bio);
+               bio_put(bio);
+       }
        return ret != -EOPNOTSUPP ? ret : 0;
 }
 EXPORT_SYMBOL(blkdev_issue_write_same);
@@ -209,8 +212,11 @@ static int __blkdev_issue_zeroout(struct block_device *bdev, sector_t sector,
                }
        }
 
-       if (bio)
-               return submit_bio_wait(bio);
+       if (bio) {
+               ret = submit_bio_wait(bio);
+               bio_put(bio);
+               return ret;
+       }
        return 0;
 }