summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0096-fs-aio-simple-simple-work.patch
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--debian/patches-rt/0096-fs-aio-simple-simple-work.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/debian/patches-rt/0096-fs-aio-simple-simple-work.patch b/debian/patches-rt/0096-fs-aio-simple-simple-work.patch
index 08f95b2db..aa2679c81 100644
--- a/debian/patches-rt/0096-fs-aio-simple-simple-work.patch
+++ b/debian/patches-rt/0096-fs-aio-simple-simple-work.patch
@@ -1,7 +1,7 @@
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Mon, 16 Feb 2015 18:49:10 +0100
-Subject: [PATCH 096/351] fs/aio: simple simple work
-Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=e6b2f2ea19d44e55222b3d0455ec4b279a8cef52
+Subject: [PATCH 096/353] fs/aio: simple simple work
+Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=94821aaab24207586e09fd2fa7203bce01a03394
|BUG: sleeping function called from invalid context at kernel/locking/rtmutex.c:768
|in_atomic(): 1, irqs_disabled(): 0, pid: 26, name: rcuos/2
@@ -29,7 +29,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/fs/aio.c b/fs/aio.c
-index 9635c29b83da..21eacb0f3f56 100644
+index 1bd934eccbf6..ab1bb9260056 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -42,6 +42,7 @@
@@ -56,7 +56,7 @@ index 9635c29b83da..21eacb0f3f56 100644
aio_mnt = kern_mount(&aio_fs);
if (IS_ERR(aio_mnt))
panic("Failed to create aio fs mount.");
-@@ -608,9 +611,9 @@ static void free_ioctx_reqs(struct percpu_ref *ref)
+@@ -612,9 +615,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.
*/
@@ -68,7 +68,7 @@ index 9635c29b83da..21eacb0f3f56 100644
struct aio_kiocb *req;
spin_lock_irq(&ctx->ctx_lock);
-@@ -628,6 +631,14 @@ static void free_ioctx_users(struct percpu_ref *ref)
+@@ -632,6 +635,14 @@ static void free_ioctx_users(struct percpu_ref *ref)
percpu_ref_put(&ctx->reqs);
}