From bcf3de430d4d0c719ed3fd8eeaf542f493bf7acb Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 18 Sep 2021 14:59:11 +0200 Subject: [PATCH] fix up queue-5.14/io_uring-allow-retry-for-o_nonblock-if-async-is-supported.patch --- ...ing-allow-retry-for-o_nonblock-if-async-is-supported.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/queue-5.14/io_uring-allow-retry-for-o_nonblock-if-async-is-supported.patch b/queue-5.14/io_uring-allow-retry-for-o_nonblock-if-async-is-supported.patch index 8d36e588400..340ee703ecb 100644 --- a/queue-5.14/io_uring-allow-retry-for-o_nonblock-if-async-is-supported.patch +++ b/queue-5.14/io_uring-allow-retry-for-o_nonblock-if-async-is-supported.patch @@ -1,4 +1,4 @@ -From foo@baz Sat Sep 18 02:46:52 PM CEST 2021 +From foo@baz Sat Sep 18 02:58:04 PM CEST 2021 From: Jens Axboe Date: Tue, 14 Sep 2021 11:08:37 -0600 Subject: io_uring: allow retry for O_NONBLOCK if async is supported @@ -45,7 +45,7 @@ Signed-off-by: Greg Kroah-Hartman + * reliably. If not, or it IOCB_NOWAIT is set, don't retry. + */ + if ((kiocb->ki_flags & IOCB_NOWAIT) || -+ ((file->f_flags & O_NONBLOCK) && !io_file_supports_nowait(req, rw))) ++ ((file->f_flags & O_NONBLOCK) && !io_file_supports_async(req, rw))) req->flags |= REQ_F_NOWAIT; ioprio = READ_ONCE(sqe->ioprio); -- 2.47.3