From 0a026341cfd22ec5e504ceac81480a74197026d6 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Fri, 25 Sep 2020 09:01:53 -0600 Subject: [PATCH 2093/2944] io_uring: don't unconditionally set plug->nowait = true to #29998112 commit 62c774ed483174b994c79e0c9f596b315f1ddfaf upstream 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: Dan Melnic Reported-by: Brian Foster Fixes: b63534c41e20 ("io_uring: re-issue block requests that failed because of resources") Signed-off-by: Jens Axboe Signed-off-by: Hao Xu Reviewed-by: Joseph Qi --- fs/io_uring.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/fs/io_uring.c b/fs/io_uring.c index 5fa9517..0cabc19 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -6091,9 +6091,6 @@ static void io_submit_state_start(struct io_submit_state *state, unsigned int max_ios) { blk_start_plug(&state->plug); -#ifdef CONFIG_BLOCK - state->plug.nowait = true; -#endif state->free_reqs = 0; state->file = NULL; state->ios_left = max_ios; -- 1.8.3.1