summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0025-NFSv4-replace-seqcount_t-with-a-seqlock_t.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-08 04:17:45 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-08 04:17:45 +0000
commit656493a7e5f26f40c85e9a184945dcc1857cb3a9 (patch)
treec0f472bc5c6179c632dc6a8ec4b44d8f2cddc7dd /debian/patches-rt/0025-NFSv4-replace-seqcount_t-with-a-seqlock_t.patch
parentMerging upstream version 4.19.289. (diff)
downloadlinux-656493a7e5f26f40c85e9a184945dcc1857cb3a9.tar.xz
linux-656493a7e5f26f40c85e9a184945dcc1857cb3a9.zip
Adding debian version 4.19.289-1.debian/4.19.289-1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches-rt/0025-NFSv4-replace-seqcount_t-with-a-seqlock_t.patch')
-rw-r--r--debian/patches-rt/0025-NFSv4-replace-seqcount_t-with-a-seqlock_t.patch18
1 files changed, 9 insertions, 9 deletions
diff --git a/debian/patches-rt/0025-NFSv4-replace-seqcount_t-with-a-seqlock_t.patch b/debian/patches-rt/0025-NFSv4-replace-seqcount_t-with-a-seqlock_t.patch
index f127a36d7..95f7193d7 100644
--- a/debian/patches-rt/0025-NFSv4-replace-seqcount_t-with-a-seqlock_t.patch
+++ b/debian/patches-rt/0025-NFSv4-replace-seqcount_t-with-a-seqlock_t.patch
@@ -1,7 +1,7 @@
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Fri, 28 Oct 2016 23:05:11 +0200
Subject: [PATCH 025/353] NFSv4: replace seqcount_t with a seqlock_t
-Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=e36671ce4bf576f03e10887842cb4d4d18b2373c
+Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=9de4c145bdbac174d7d6cfc31a27cb41edc0fac9
The raw_write_seqcount_begin() in nfs4_reclaim_open_state() bugs me
because it maps to preempt_disable() in -RT which I can't have at this
@@ -44,7 +44,7 @@ index b0c0c2fc2fba..26565ba05dc1 100644
mutex_unlock(&sp->so_delegreturn_mutex);
put_nfs_open_context(ctx);
diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h
-index 5ac7bf24c507..b15a7a2f64fe 100644
+index 2d438318681a..e6cecc00c379 100644
--- a/fs/nfs/nfs4_fs.h
+++ b/fs/nfs/nfs4_fs.h
@@ -114,7 +114,7 @@ struct nfs4_state_owner {
@@ -57,10 +57,10 @@ index 5ac7bf24c507..b15a7a2f64fe 100644
};
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
-index 250fa88303fa..b61a0f4b2ae8 100644
+index 3651619468d7..f9d3fcb007a5 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
-@@ -2879,7 +2879,7 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata,
+@@ -2882,7 +2882,7 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata,
unsigned int seq;
int ret;
@@ -69,7 +69,7 @@ index 250fa88303fa..b61a0f4b2ae8 100644
ret = _nfs4_proc_open(opendata, ctx);
if (ret != 0)
-@@ -2920,7 +2920,7 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata,
+@@ -2923,7 +2923,7 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata,
if (d_inode(dentry) == state->inode) {
nfs_inode_attach_open_context(ctx);
@@ -79,10 +79,10 @@ index 250fa88303fa..b61a0f4b2ae8 100644
}
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
-index b9fbd01ef4cf..cd0cd6594947 100644
+index f0f0fb7499e3..7bc43e0b24ef 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
-@@ -516,7 +516,7 @@ nfs4_alloc_state_owner(struct nfs_server *server,
+@@ -520,7 +520,7 @@ nfs4_alloc_state_owner(struct nfs_server *server,
nfs4_init_seqid_counter(&sp->so_seqid);
atomic_set(&sp->so_count, 1);
INIT_LIST_HEAD(&sp->so_lru);
@@ -91,7 +91,7 @@ index b9fbd01ef4cf..cd0cd6594947 100644
mutex_init(&sp->so_delegreturn_mutex);
return sp;
}
-@@ -1586,8 +1586,12 @@ static int nfs4_reclaim_open_state(struct nfs4_state_owner *sp, const struct nfs
+@@ -1590,8 +1590,12 @@ static int nfs4_reclaim_open_state(struct nfs4_state_owner *sp, const struct nfs
* recovering after a network partition or a reboot from a
* server that doesn't support a grace period.
*/
@@ -105,7 +105,7 @@ index b9fbd01ef4cf..cd0cd6594947 100644
restart:
list_for_each_entry(state, &sp->so_states, open_states) {
if (!test_and_clear_bit(ops->state_flag_bit, &state->flags))
-@@ -1674,14 +1678,20 @@ static int nfs4_reclaim_open_state(struct nfs4_state_owner *sp, const struct nfs
+@@ -1678,14 +1682,20 @@ static int nfs4_reclaim_open_state(struct nfs4_state_owner *sp, const struct nfs
spin_lock(&sp->so_lock);
goto restart;
}