Commit 62c774ed authored by Jens Axboe's avatar Jens Axboe

io_uring: don't unconditionally set plug->nowait = true

This causes all the bios to be submitted with REQ_NOWAIT, which can be
problematic on either btrfs or on file systems that otherwise use a mix
of block devices where only some of them support it.

For now, just remove the setting of plug->nowait = true.
Reported-by: default avatarDan Melnic <dmm@fb.com>
Reported-by: default avatarBrian Foster <bfoster@redhat.com>
Fixes: b63534c4 ("io_uring: re-issue block requests that failed because of resources")
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent f3cd4850
...@@ -6353,9 +6353,6 @@ static void io_submit_state_start(struct io_submit_state *state, ...@@ -6353,9 +6353,6 @@ static void io_submit_state_start(struct io_submit_state *state,
struct io_ring_ctx *ctx, unsigned int max_ios) struct io_ring_ctx *ctx, unsigned int max_ios)
{ {
blk_start_plug(&state->plug); blk_start_plug(&state->plug);
#ifdef CONFIG_BLOCK
state->plug.nowait = true;
#endif
state->comp.nr = 0; state->comp.nr = 0;
INIT_LIST_HEAD(&state->comp.list); INIT_LIST_HEAD(&state->comp.list);
state->comp.ctx = ctx; state->comp.ctx = ctx;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment