Skip to contentSkip to conversation

c/r: fs, proc: Move children entry back to tid_base_stuff

PATCH In review Cyrill Gorcunov 2 participants 2 messages Apr 25, 2012 Proc filesystem

lore
Share & tools
lore

Cyrill Gorcunov

author
#0 lore raw

PATCH 1/1 c/r: fs, proc: Move children entry back to tid_base_stuff

While merging to linux-next the "children" entry jumped from tid_base_stuff to tgid_base_stuff by mistake.
Fix it, by moving it back.

Signed-off-by Cyrill Gorcunov <[email protected]>
Cc Oleg Nesterov <[email protected]>
Cc Kees Cook <[email protected]>
Cc Pavel Emelyanov <[email protected]>
Cc Serge Hallyn <[email protected]>
Cc KAMEZAWA Hiroyuki <[email protected]>
Cc Andrew Morton <[email protected]>

---

Andrew, I suspect this nit happened when the patch was merged to linux-next.

 fs/proc/base.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
fs/proc/base.c +3 -3
Index: linux-2.6.git/fs/proc/base.c
===================================================================
@@ -2990,9 +2990,6 @@ static const struct pid_entry tgid_base_
 	ONE("stat",       S_IRUGO, proc_tgid_stat),
 	ONE("statm",      S_IRUGO, proc_pid_statm),
 	REG("maps",       S_IRUGO, proc_pid_maps_operations),
-#ifdef CONFIG_CHECKPOINT_RESTORE
-	REG("children",  S_IRUGO, proc_tid_children_operations),
-#endif
 #ifdef CONFIG_NUMA
 	REG("numa_maps",  S_IRUGO, proc_pid_numa_maps_operations),
 #endif

@@ -3352,6 +3349,9 @@ static const struct pid_entry tid_base_s
 	ONE("stat",      S_IRUGO, proc_tid_stat),
 	ONE("statm",     S_IRUGO, proc_pid_statm),
 	REG("maps",      S_IRUGO, proc_tid_maps_operations),
+#ifdef CONFIG_CHECKPOINT_RESTORE
+	REG("children",  S_IRUGO, proc_tid_children_operations),
+#endif
 #ifdef CONFIG_NUMA
 	REG("numa_maps", S_IRUGO, proc_tid_numa_maps_operations),
 #endif