summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0279-revert-aio.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-06 01:02:38 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-06 01:02:38 +0000
commit08b74a000942a380fe028845f92cd3a0dee827d5 (patch)
treeaa78b4e12607c3e1fcce8d5cc42df4330792f118 /debian/patches-rt/0279-revert-aio.patch
parentAdding upstream version 4.19.249. (diff)
downloadlinux-f0b728ab30c2182dd64b73ed0c39114124b8488a.tar.xz
linux-f0b728ab30c2182dd64b73ed0c39114124b8488a.zip
Adding debian version 4.19.249-2.debian/4.19.249-2debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches-rt/0279-revert-aio.patch')
-rw-r--r--debian/patches-rt/0279-revert-aio.patch71
1 files changed, 71 insertions, 0 deletions
diff --git a/debian/patches-rt/0279-revert-aio.patch b/debian/patches-rt/0279-revert-aio.patch
new file mode 100644
index 000000000..2473add45
--- /dev/null
+++ b/debian/patches-rt/0279-revert-aio.patch
@@ -0,0 +1,71 @@
+From f543c9a26aefcba7e267ea5d79ee00bcf6679b50 Mon Sep 17 00:00:00 2001
+From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
+Date: Fri, 20 Sep 2019 17:50:53 -0400
+Subject: [PATCH 279/347] revert-aio
+Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patches-4.19.246-rt110.tar.xz
+
+revert: fs/aio: simple simple work
+
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+---
+ fs/aio.c | 15 ++-------------
+ 1 file changed, 2 insertions(+), 13 deletions(-)
+
+diff --git a/fs/aio.c b/fs/aio.c
+index 21eacb0f3f56..9635c29b83da 100644
+--- a/fs/aio.c
++++ b/fs/aio.c
+@@ -42,7 +42,6 @@
+ #include <linux/ramfs.h>
+ #include <linux/percpu-refcount.h>
+ #include <linux/mount.h>
+-#include <linux/swork.h>
+
+ #include <asm/kmap_types.h>
+ #include <linux/uaccess.h>
+@@ -122,7 +121,6 @@ struct kioctx {
+ long nr_pages;
+
+ struct rcu_work free_rwork; /* see free_ioctx() */
+- struct swork_event free_swork; /* see free_ioctx() */
+
+ /*
+ * signals when all in-flight requests are done
+@@ -269,7 +267,6 @@ static int __init aio_setup(void)
+ .mount = aio_mount,
+ .kill_sb = kill_anon_super,
+ };
+- BUG_ON(swork_get());
+ aio_mnt = kern_mount(&aio_fs);
+ if (IS_ERR(aio_mnt))
+ panic("Failed to create aio fs mount.");
+@@ -611,9 +608,9 @@ static void free_ioctx_reqs(struct percpu_ref *ref)
+ * and ctx->users has dropped to 0, so we know no more kiocbs can be submitted -
+ * now it's safe to cancel any that need to be.
+ */
+-static void free_ioctx_users_work(struct swork_event *sev)
++static void free_ioctx_users(struct percpu_ref *ref)
+ {
+- struct kioctx *ctx = container_of(sev, struct kioctx, free_swork);
++ struct kioctx *ctx = container_of(ref, struct kioctx, users);
+ struct aio_kiocb *req;
+
+ spin_lock_irq(&ctx->ctx_lock);
+@@ -631,14 +628,6 @@ static void free_ioctx_users_work(struct swork_event *sev)
+ percpu_ref_put(&ctx->reqs);
+ }
+
+-static void free_ioctx_users(struct percpu_ref *ref)
+-{
+- struct kioctx *ctx = container_of(ref, struct kioctx, users);
+-
+- INIT_SWORK(&ctx->free_swork, free_ioctx_users_work);
+- swork_queue(&ctx->free_swork);
+-}
+-
+ static int ioctx_add_table(struct kioctx *ctx, struct mm_struct *mm)
+ {
+ unsigned i, new_nr;
+--
+2.36.1
+