proc-add-tgid_iterpid_ns-member.patch removed from -mm tree
The quilt patch titled
Subject: proc: add tgid_iter.pid_ns member
has been removed from the -mm tree. Its filename was
proc-add-tgid_iterpid_ns-member.patch
This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Alexey Dobriyan <[email protected]>
Subject: proc: add tgid_iter.pid_ns member
Date: Wed, 22 Apr 2026 22:17:44 +0300
next_tgid() accepts pid namespace as an argument, but it never changes during readdir (which would be unthinkable thing to do anyway).
Move it inside iterator type and hide from direct usage.
Signed-off-by Alexey Dobriyan <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
fs/proc/base.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
fs/proc/base.c renamed from fs/proc/base.c~proc-add-tgid_iterpid_ns-member +9 -6
@@ -3543,8 +3543,10 @@ out:struct tgid_iter {unsigned int tgid;struct task_struct *task; +struct pid_namespace *pid_ns; }; -static struct tgid_iter next_tgid (struct pid_namespace *ns,struct tgid_iter iter) + +static struct tgid_iter next_tgid (struct tgid_iter iter) {struct pid *pid;
@@ -3553,9 +3555,9 @@ static struct tgid_iter next_tgid(structrcu_read_lock (); retry: iter.task =NULL ; - pid =find_ge_pid (iter.tgid, ns); + pid =find_ge_pid (iter.tgid, iter.pid_ns);if (pid) { - iter.tgid =pid_nr_ns (pid, ns); + iter.tgid =pid_nr_ns (pid, iter.pid_ns); iter.task =pid_task (pid,PIDTYPE_TGID );if (!iter.task) { iter.tgid +=1 ;
@@ -3574,7 +3576,7 @@ int proc_pid_readdir(struct file *file, {struct tgid_iter iter;struct proc_fs_info *fs_info =proc_sb_info (file_inode (file)->i_sb); -struct pid_namespace *ns =proc_pid_ns (file_inode (file)->i_sb); +struct pid_namespace *pid_ns =proc_pid_ns (file_inode (file)->i_sb);loff_t pos = ctx->pos;if (pos >=PID_MAX_LIMIT +TGID_OFFSET )
@@ -3592,9 +3594,10 @@ int proc_pid_readdir(struct file *file, } iter.tgid = pos -TGID_OFFSET ; iter.task =NULL ; -for (iter =next_tgid (ns, iter); + iter.pid_ns = pid_ns; +for (iter =next_tgid (iter); iter.task; - iter.tgid +=1 , iter =next_tgid (ns, iter)) { + iter.tgid +=1 , iter =next_tgid (iter)) {char name[10 +1 ];unsigned int len;
_
Patches currently in -mm which might be from [email protected] are