summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0303-fscache-Use-only-one-fscache_object_cong_wait.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches-rt/0303-fscache-Use-only-one-fscache_object_cong_wait.patch')
-rw-r--r--debian/patches-rt/0303-fscache-Use-only-one-fscache_object_cong_wait.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/debian/patches-rt/0303-fscache-Use-only-one-fscache_object_cong_wait.patch b/debian/patches-rt/0303-fscache-Use-only-one-fscache_object_cong_wait.patch
index a2f67e27c..1f05bc3f0 100644
--- a/debian/patches-rt/0303-fscache-Use-only-one-fscache_object_cong_wait.patch
+++ b/debian/patches-rt/0303-fscache-Use-only-one-fscache_object_cong_wait.patch
@@ -1,8 +1,8 @@
-From 9ebcbc0c3bbeaa6e13b623ff2d84d3b29e0a1431 Mon Sep 17 00:00:00 2001
+From 811779e6a823e7bdf8dcbd8ee78f4265a5afe052 Mon Sep 17 00:00:00 2001
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Thu, 28 Oct 2021 17:30:50 +0200
Subject: [PATCH 303/323] fscache: Use only one fscache_object_cong_wait.
-Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patches-5.10.204-rt100.tar.xz
+Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patches-5.10.215-rt107.tar.xz
In the commit mentioned below, fscache was converted from slow-work to
workqueue. slow_work_enqueue() and slow_work_sleep_till_thread_needed()
@@ -36,7 +36,7 @@ Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
3 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h
-index 64aa552b296d..7dae569dafb9 100644
+index 64aa552b296d7..7dae569dafb9d 100644
--- a/fs/fscache/internal.h
+++ b/fs/fscache/internal.h
@@ -95,7 +95,6 @@ extern unsigned fscache_debug;
@@ -48,7 +48,7 @@ index 64aa552b296d..7dae569dafb9 100644
extern unsigned int fscache_hash(unsigned int salt, unsigned int *data, unsigned int n);
diff --git a/fs/fscache/main.c b/fs/fscache/main.c
-index 4207f98e405f..85f8cf3a323d 100644
+index 4207f98e405fd..85f8cf3a323d5 100644
--- a/fs/fscache/main.c
+++ b/fs/fscache/main.c
@@ -41,8 +41,6 @@ struct kobject *fscache_root;
@@ -79,7 +79,7 @@ index 4207f98e405f..85f8cf3a323d 100644
if (ret < 0)
goto error_proc;
diff --git a/fs/fscache/object.c b/fs/fscache/object.c
-index cb2146e02cd5..55158f30d093 100644
+index cb2146e02cd54..55158f30d0935 100644
--- a/fs/fscache/object.c
+++ b/fs/fscache/object.c
@@ -807,6 +807,8 @@ void fscache_object_destroy(struct fscache_object *object)
@@ -125,5 +125,5 @@ index cb2146e02cd5..55158f30d093 100644
return fscache_object_congested();
}
--
-2.43.0
+2.44.0