]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
fix up queue-5.14/io_uring-allow-retry-for-o_nonblock-if-async-is-supported.patch
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 18 Sep 2021 12:59:11 +0000 (14:59 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 18 Sep 2021 12:59:11 +0000 (14:59 +0200)
queue-5.14/io_uring-allow-retry-for-o_nonblock-if-async-is-supported.patch

index 8d36e588400932c27e3f5387cea280d412ade4e3..340ee703ecb218e8bf8a0bea920864c05dc0083d 100644 (file)
@@ -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);