diff options
author | Jens Axboe <axboe@kernel.dk> | 2018-12-21 09:10:46 -0700 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2019-02-24 08:20:17 -0700 |
commit | 0bbb280d7b767e7c86a5adfc87c76a6f09ab0423 (patch) | |
tree | 5e2b9970b0144b91c5b8def73827aacca82845f4 /fs/block_dev.c | |
parent | eae83ce10b4713d9f4f3419af16436f89c1a7172 (diff) | |
download | linux-stable-0bbb280d7b767e7c86a5adfc87c76a6f09ab0423.tar.gz linux-stable-0bbb280d7b767e7c86a5adfc87c76a6f09ab0423.tar.bz2 linux-stable-0bbb280d7b767e7c86a5adfc87c76a6f09ab0423.zip |
block: add bio_set_polled() helper
For the upcoming async polled IO, we can't sleep allocating requests.
If we do, then we introduce a deadlock where the submitter already
has async polled IO in-flight, but can't wait for them to complete
since polled requests must be active found and reaped.
Utilize the helper in the blockdev DIRECT_IO code.
Reviewed-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs/block_dev.c')
-rw-r--r-- | fs/block_dev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/block_dev.c b/fs/block_dev.c index 1fe498b08f1b..e9faa52bb489 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -248,7 +248,7 @@ __blkdev_direct_IO_simple(struct kiocb *iocb, struct iov_iter *iter, task_io_account_write(ret); } if (iocb->ki_flags & IOCB_HIPRI) - bio.bi_opf |= REQ_HIPRI; + bio_set_polled(&bio, iocb); qc = submit_bio(&bio); for (;;) { @@ -419,7 +419,7 @@ __blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter, int nr_pages) bool polled = false; if (iocb->ki_flags & IOCB_HIPRI) { - bio->bi_opf |= REQ_HIPRI; + bio_set_polled(bio, iocb); polled = true; } |