summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-06-29 14:10:37 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-06-29 14:10:37 -0700
commit374bf8831aa99a445d6d26c56a65fb35db747d91 (patch)
treefa7f85706041be3969a2d0397f08f4f933b54a81 /fs
parent6474924e2b5ddb0030c355558966adcbe3b49022 (diff)
parent9ae3b3f52c62ddd5eb12c57f195f4f38121faa01 (diff)
downloadop-kernel-dev-374bf8831aa99a445d6d26c56a65fb35db747d91.zip
op-kernel-dev-374bf8831aa99a445d6d26c56a65fb35db747d91.tar.gz
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe: "Two fixes that should go into this release. One is an nvme regression fix from Keith, fixing a missing queue freeze if the controller is being reset. This causes the reset to hang. The other is a fix for a leak of the bio protection info, if smaller sized O_DIRECT is used. This fix should be more involved as we have other problematic paths in the kernel, but given as this isn't a regression in this series, we'll tackle those for 4.13" * 'for-linus' of git://git.kernel.dk/linux-block: block: provide bio_uninit() free freeing integrity/task associations nvme/pci: Fix stuck nvme reset
Diffstat (limited to 'fs')
-rw-r--r--fs/block_dev.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/block_dev.c b/fs/block_dev.c
index 519599d..0a7404e 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -263,7 +263,10 @@ __blkdev_direct_IO_simple(struct kiocb *iocb, struct iov_iter *iter,
kfree(vecs);
if (unlikely(bio.bi_error))
- return bio.bi_error;
+ ret = bio.bi_error;
+
+ bio_uninit(&bio);
+
return ret;
}
OpenPOWER on IntegriCloud