drop sunrpc patch from 5.4 and 5.10

diff --git a/queue-5.10/series b/queue-5.10/series
index e56b1acefa3a4ae319faa0867f07efe81fcae520..451079d919cce67baea3dd79f562cd70c0006ebd 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -31,5 +31,4 @@ btrfs-record-delayed-inode-root-in-transaction.patch
 riscv-enable-per-task-stack-canaries.patch
 riscv-process-fix-kernel-gp-leakage.patch
 ring-buffer-only-update-pages_touched-when-a-new-pag.patch
-sunrpc-fix-rpcgss_context-trace-event-acceptor-field.patch
 selftests-ftrace-limit-length-in-subsystem-enable-tests.patch

diff --git a/queue-5.10/sunrpc-fix-rpcgss_context-trace-event-acceptor-field.patch b/queue-5.10/sunrpc-fix-rpcgss_context-trace-event-acceptor-field.patch
deleted file mode 100644 (file)
index 8458b64..0000000
--- a/queue-5.10/sunrpc-fix-rpcgss_context-trace-event-acceptor-field.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From a4833e3abae132d613ce7da0e0c9a9465d1681fa Mon Sep 17 00:00:00 2001
-From: "Steven Rostedt (Google)" <rostedt@goodmis.org>
-Date: Wed, 10 Apr 2024 12:38:13 -0400
-Subject: SUNRPC: Fix rpcgss_context trace event acceptor field
-
-From: Steven Rostedt (Google) <rostedt@goodmis.org>
-
-commit a4833e3abae132d613ce7da0e0c9a9465d1681fa upstream.
-
-The rpcgss_context trace event acceptor field is a dynamically sized
-string that records the "data" parameter. But this parameter is also
-dependent on the "len" field to determine the size of the data.
-
-It needs to use __string_len() helper macro where the length can be passed
-in. It also incorrectly uses strncpy() to save it instead of
-__assign_str(). As these macros can change, it is not wise to open code
-them in trace events.
-
-As of commit c759e609030c ("tracing: Remove __assign_str_len()"),
-__assign_str() can be used for both __string() and __string_len() fields.
-Before that commit, __assign_str_len() is required to be used. This needs
-to be noted for backporting. (In actuality, commit c1fa617caeb0 ("tracing:
-Rework __assign_str() and __string() to not duplicate getting the string")
-is the commit that makes __string_str_len() obsolete).
-
-Cc: stable@vger.kernel.org
-Fixes: 0c77668ddb4e ("SUNRPC: Introduce trace points in rpc_auth_gss.ko")
-Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
-Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- include/trace/events/rpcgss.h |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/include/trace/events/rpcgss.h
-+++ b/include/trace/events/rpcgss.h
-@@ -581,7 +581,7 @@ TRACE_EVENT(rpcgss_context,
-               __field(unsigned int, timeout)
-               __field(u32, window_size)
-               __field(int, len)
--              __string(acceptor, data)
-+              __string_len(acceptor, data, len)
-       ),
- 
-       TP_fast_assign(
-@@ -590,7 +590,7 @@ TRACE_EVENT(rpcgss_context,
-               __entry->timeout = timeout;
-               __entry->window_size = window_size;
-               __entry->len = len;
--              strncpy(__get_str(acceptor), data, len);
-+              __assign_str(acceptor, data);
-       ),
- 
-       TP_printk("win_size=%u expiry=%lu now=%lu timeout=%u acceptor=%.*s",

diff --git a/queue-5.4/series b/queue-5.4/series
index ee423bf8e04b18908bba20f641a84b71a83d573c..7bd35c24eb8c4b498e8b24984288a8f3584f0cff 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -18,5 +18,4 @@ selftests-timers-fix-abs-warning-in-posix_timers-test.patch
 x86-apic-force-native_apic_mem_read-to-use-the-mov-instruction.patch
 btrfs-record-delayed-inode-root-in-transaction.patch
 ring-buffer-only-update-pages_touched-when-a-new-pag.patch
-sunrpc-fix-rpcgss_context-trace-event-acceptor-field.patch
 selftests-ftrace-limit-length-in-subsystem-enable-tests.patch

diff --git a/queue-5.4/sunrpc-fix-rpcgss_context-trace-event-acceptor-field.patch b/queue-5.4/sunrpc-fix-rpcgss_context-trace-event-acceptor-field.patch
deleted file mode 100644 (file)
index 34621f6..0000000
--- a/queue-5.4/sunrpc-fix-rpcgss_context-trace-event-acceptor-field.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From a4833e3abae132d613ce7da0e0c9a9465d1681fa Mon Sep 17 00:00:00 2001
-From: "Steven Rostedt (Google)" <rostedt@goodmis.org>
-Date: Wed, 10 Apr 2024 12:38:13 -0400
-Subject: SUNRPC: Fix rpcgss_context trace event acceptor field
-
-From: Steven Rostedt (Google) <rostedt@goodmis.org>
-
-commit a4833e3abae132d613ce7da0e0c9a9465d1681fa upstream.
-
-The rpcgss_context trace event acceptor field is a dynamically sized
-string that records the "data" parameter. But this parameter is also
-dependent on the "len" field to determine the size of the data.
-
-It needs to use __string_len() helper macro where the length can be passed
-in. It also incorrectly uses strncpy() to save it instead of
-__assign_str(). As these macros can change, it is not wise to open code
-them in trace events.
-
-As of commit c759e609030c ("tracing: Remove __assign_str_len()"),
-__assign_str() can be used for both __string() and __string_len() fields.
-Before that commit, __assign_str_len() is required to be used. This needs
-to be noted for backporting. (In actuality, commit c1fa617caeb0 ("tracing:
-Rework __assign_str() and __string() to not duplicate getting the string")
-is the commit that makes __string_str_len() obsolete).
-
-Cc: stable@vger.kernel.org
-Fixes: 0c77668ddb4e ("SUNRPC: Introduce trace points in rpc_auth_gss.ko")
-Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
-Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- include/trace/events/rpcgss.h |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/include/trace/events/rpcgss.h
-+++ b/include/trace/events/rpcgss.h
-@@ -300,7 +300,7 @@ TRACE_EVENT(rpcgss_context,
-               __field(unsigned long, now)
-               __field(unsigned int, timeout)
-               __field(int, len)
--              __string(acceptor, data)
-+              __string_len(acceptor, data, len)
-       ),
- 
-       TP_fast_assign(
-@@ -308,7 +308,7 @@ TRACE_EVENT(rpcgss_context,
-               __entry->now = now;
-               __entry->timeout = timeout;
-               __entry->len = len;
--              strncpy(__get_str(acceptor), data, len);
-+              __assign_str(acceptor, data);
-       ),
- 
-       TP_printk("gc_expiry=%lu now=%lu timeout=%u acceptor=%.*s",