Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc23af4e authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "procfs: Update order of Ngid in /proc/PID/status"

parents 2917e6a2 f6931b82

fs/proc/array.c

+4 −4
Original line number Diff line number Diff line
@@ -174,15 +174,14 @@ static inline void task_state(struct seq_file *m, struct pid_namespace *ns, 
	seq_printf(m,

		"State:\t%s\n"

		"Tgid:\t%d\n"

		"Ngid:\t%d\n"

		"Pid:\t%d\n"

		"PPid:\t%d\n"

		"TracerPid:\t%d\n"

		"Uid:\t%d\t%d\t%d\t%d\n"

		"Gid:\t%d\t%d\t%d\t%d\n",

		"Gid:\t%d\t%d\t%d\t%d\n"

		"Ngid:\t%d\n",

		get_task_state(p),

		task_tgid_nr_ns(p, ns),

		task_numa_group_id(p),

		pid_nr_ns(pid, ns),

		ppid, tpid,

		from_kuid_munged(user_ns, cred->uid),
@@ -192,7 +191,8 @@ static inline void task_state(struct seq_file *m, struct pid_namespace *ns, 
		from_kgid_munged(user_ns, cred->gid),

		from_kgid_munged(user_ns, cred->egid),

		from_kgid_munged(user_ns, cred->sgid),

		from_kgid_munged(user_ns, cred->fsgid));

		from_kgid_munged(user_ns, cred->fsgid),

		task_numa_group_id(p));



	task_lock(p);

	if (p->files)