From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 4 Mar 2024 07:52:22 +0000 (+0100)
Subject: fix up aio patch for older kernels
X-Git-Tag: v4.19.309~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1629360124241d50ca1f2b1b8f4028e3d807d801;p=thirdparty%2Fkernel%2Fstable-queue.git

fix up aio patch for older kernels
---

diff --git a/queue-4.19/fs-aio-make-io_cancel-generate-completions-again.patch b/queue-4.19/fs-aio-make-io_cancel-generate-completions-again.patch
index 276018748fc..4841c176e4d 100644
--- a/queue-4.19/fs-aio-make-io_cancel-generate-completions-again.patch
+++ b/queue-4.19/fs-aio-make-io_cancel-generate-completions-again.patch
@@ -79,7 +79,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +	 * delivered via the ring buffer.
 +	 */
 +	if (ret == 0 && kiocb->rw.ki_flags & IOCB_AIO_RW)
-+		aio_complete_rw(&kiocb->rw, -EINTR);
++		aio_complete_rw(&kiocb->rw, -EINTR, 0);
  
  	percpu_ref_put(&ctx->users);
  
diff --git a/queue-5.10/fs-aio-make-io_cancel-generate-completions-again.patch b/queue-5.10/fs-aio-make-io_cancel-generate-completions-again.patch
index abac7ad03a0..10f73245faf 100644
--- a/queue-5.10/fs-aio-make-io_cancel-generate-completions-again.patch
+++ b/queue-5.10/fs-aio-make-io_cancel-generate-completions-again.patch
@@ -79,7 +79,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +	 * delivered via the ring buffer.
 +	 */
 +	if (ret == 0 && kiocb->rw.ki_flags & IOCB_AIO_RW)
-+		aio_complete_rw(&kiocb->rw, -EINTR);
++		aio_complete_rw(&kiocb->rw, -EINTR, 0);
  
  	percpu_ref_put(&ctx->users);
  
diff --git a/queue-5.15/fs-aio-make-io_cancel-generate-completions-again.patch b/queue-5.15/fs-aio-make-io_cancel-generate-completions-again.patch
index fa3c548ea2d..c42b389a9f2 100644
--- a/queue-5.15/fs-aio-make-io_cancel-generate-completions-again.patch
+++ b/queue-5.15/fs-aio-make-io_cancel-generate-completions-again.patch
@@ -79,7 +79,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +	 * delivered via the ring buffer.
 +	 */
 +	if (ret == 0 && kiocb->rw.ki_flags & IOCB_AIO_RW)
-+		aio_complete_rw(&kiocb->rw, -EINTR);
++		aio_complete_rw(&kiocb->rw, -EINTR, 0);
  
  	percpu_ref_put(&ctx->users);
  
diff --git a/queue-5.4/fs-aio-make-io_cancel-generate-completions-again.patch b/queue-5.4/fs-aio-make-io_cancel-generate-completions-again.patch
index 75218fca82b..f6ac934fcec 100644
--- a/queue-5.4/fs-aio-make-io_cancel-generate-completions-again.patch
+++ b/queue-5.4/fs-aio-make-io_cancel-generate-completions-again.patch
@@ -79,7 +79,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +	 * delivered via the ring buffer.
 +	 */
 +	if (ret == 0 && kiocb->rw.ki_flags & IOCB_AIO_RW)
-+		aio_complete_rw(&kiocb->rw, -EINTR);
++		aio_complete_rw(&kiocb->rw, -EINTR, 0);
  
  	percpu_ref_put(&ctx->users);