From: Sasha Levin Date: Mon, 25 Aug 2025 11:59:17 +0000 (-0400) Subject: Drop pidfs-move-to-anonymous-struct.patch X-Git-Tag: v5.4.297~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=96833b1e4758ed7523d4c10c15c6ee67a0dbdb21;p=thirdparty%2Fkernel%2Fstable-queue.git Drop pidfs-move-to-anonymous-struct.patch Signed-off-by: Sasha Levin --- diff --git a/queue-6.16/pidfs-move-to-anonymous-struct.patch b/queue-6.16/pidfs-move-to-anonymous-struct.patch deleted file mode 100644 index 7392ba8022..0000000000 --- a/queue-6.16/pidfs-move-to-anonymous-struct.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 4c0f467c619d0226966270385e884d37fa8703d2 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 18 Jun 2025 22:53:38 +0200 -Subject: pidfs: move to anonymous struct - -From: Christian Brauner - -[ Upstream commit 75215c972581d3934e76a57690cf838d7ceab399 ] - -Move the pidfs entries to an anonymous struct. - -Link: https://lore.kernel.org/20250618-work-pidfs-persistent-v2-4-98f3456fd552@kernel.org -Reviewed-by: Alexander Mikhalitsyn -Signed-off-by: Christian Brauner -Stable-dep-of: 0b2d71a7c826 ("pidfs: Fix memory leak in pidfd_info()") -Signed-off-by: Sasha Levin ---- - include/linux/pid.h | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -diff --git a/include/linux/pid.h b/include/linux/pid.h -index 453ae6d8a68d..00646a692dd4 100644 ---- a/include/linux/pid.h -+++ b/include/linux/pid.h -@@ -52,14 +52,15 @@ struct upid { - struct pid_namespace *ns; - }; - --struct pid --{ -+struct pid { - refcount_t count; - unsigned int level; - spinlock_t lock; -- struct dentry *stashed; -- u64 ino; -- struct rb_node pidfs_node; -+ struct { -+ u64 ino; -+ struct rb_node pidfs_node; -+ struct dentry *stashed; -+ }; - /* lists of tasks that use this pid */ - struct hlist_head tasks[PIDTYPE_MAX]; - struct hlist_head inodes; --- -2.50.1 - diff --git a/queue-6.16/series b/queue-6.16/series index d77cb16e05..d6952483ef 100644 --- a/queue-6.16/series +++ b/queue-6.16/series @@ -283,7 +283,6 @@ fs-fix-incorrect-lflags-value-in-the-move_mount-sysc.patch btrfs-zoned-fix-data-relocation-block-group-reservat.patch fhandle-do_handle_open-should-get-fd-with-user-flags.patch libfs-massage-path_from_stashed-to-allow-custom-stas.patch -pidfs-move-to-anonymous-struct.patch smb-server-split-ksmbd_rdma_stop_listening-out-of-ks.patch fs-buffer-fix-use-after-free-when-call-bh_read-helpe.patch signal-fix-memory-leak-for-pidfd_self-sentinels.patch