diff options
| author | Jens Axboe <axboe@kernel.dk> | 2020-05-28 13:19:29 -0600 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-06-03 08:23:26 +0200 |
| commit | b94ab990ef4ad5ef444a3609f540d0acfc7b72d1 (patch) | |
| tree | bf868aa6a7f0764aab51e2e0801b5712a3edd116 | |
| parent | 430f5de588dbcf2f937f5272a362425f4aee9162 (diff) | |
| download | linux-b94ab990ef4ad5ef444a3609f540d0acfc7b72d1.tar.gz linux-b94ab990ef4ad5ef444a3609f540d0acfc7b72d1.tar.bz2 linux-b94ab990ef4ad5ef444a3609f540d0acfc7b72d1.zip | |
Revert "block: end bio with BLK_STS_AGAIN in case of non-mq devs and REQ_NOWAIT"
[ Upstream commit b0beb28097fa04177b3769f4bb7a0d0d9c4ae76e ]
This reverts commit c58c1f83436b501d45d4050fd1296d71a9760bcb.
io_uring does do the right thing for this case, and we're still returning
-EAGAIN to userspace for the cases we don't support. Revert this change
to avoid doing endless spins of resubmits.
Cc: stable@vger.kernel.org # v5.6
Reported-by: Bijan Mottahedeh <bijan.mottahedeh@oracle.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | block/blk-core.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 60dc9552ef8d..92232907605c 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -885,14 +885,11 @@ generic_make_request_checks(struct bio *bio) } /* - * Non-mq queues do not honor REQ_NOWAIT, so complete a bio - * with BLK_STS_AGAIN status in order to catch -EAGAIN and - * to give a chance to the caller to repeat request gracefully. + * For a REQ_NOWAIT based request, return -EOPNOTSUPP + * if queue is not a request based queue. */ - if ((bio->bi_opf & REQ_NOWAIT) && !queue_is_mq(q)) { - status = BLK_STS_AGAIN; - goto end_io; - } + if ((bio->bi_opf & REQ_NOWAIT) && !queue_is_mq(q)) + goto not_supported; if (should_fail_bio(bio)) goto end_io; |