lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "block: end bio with BLK_STS_AGAIN in case of non-mq devs and REQ_NOWAIT"

Browse Source 
[ 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>
This commit is contained in:
Jens Axboe 2020-05-28 13:19:29 -06:00 committed by Greg Kroah-Hartman
parent 31f0b78bb4
commit bba91cdba6
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
block/blk-core.c
View File

@ -886,14 +886,11 @@ generic_make_request_checks(struct bio *bio)
} }
/* /*
* Non-mq queues do not honor REQ_NOWAIT, so complete a bio * For a REQ_NOWAIT based request, return -EOPNOTSUPP
* with BLK_STS_AGAIN status in order to catch -EAGAIN and * if queue is not a request based queue.
* to give a chance to the caller to repeat request gracefully.
*/ */
if ((bio->bi_opf & REQ_NOWAIT) && !queue_is_mq(q)) { if ((bio->bi_opf & REQ_NOWAIT) && !queue_is_mq(q))
status = BLK_STS_AGAIN; goto not_supported;
goto end_io;
}
if (should_fail_bio(bio)) if (should_fail_bio(bio))
goto end_io; goto end_io;