From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 18 Sep 2021 12:59:11 +0000 (+0200)
Subject: fix up queue-5.14/io_uring-allow-retry-for-o_nonblock-if-async-is-supported.patch
X-Git-Tag: v4.4.284~60
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bcf3de430d4d0c719ed3fd8eeaf542f493bf7acb;p=thirdparty%2Fkernel%2Fstable-queue.git

fix up queue-5.14/io_uring-allow-retry-for-o_nonblock-if-async-is-supported.patch
---

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 <axboe@kernel.dk>
 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 <gregkh@linuxfoundation.org>
 +	 * 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);