The patch titled tty_io-fix-remaining-pid-struct-locking-small-cleanup has been added to the -mm tree. Its filename is tty_io-fix-remaining-pid-struct-locking-small-cleanup.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: tty_io-fix-remaining-pid-struct-locking-small-cleanup From: Oleg Nesterov <oleg@xxxxxxxxxx> do_task_stat() has a huge list of the local variables, move "struct pid *pgrp" under "if (sig->tty)". Signed-off-by: Oleg Nesterov <oleg@xxxxxxxxxx> Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/proc/array.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff -puN fs/proc/array.c~tty_io-fix-remaining-pid-struct-locking-small-cleanup fs/proc/array.c --- a/fs/proc/array.c~tty_io-fix-remaining-pid-struct-locking-small-cleanup +++ a/fs/proc/array.c @@ -408,7 +408,6 @@ static int do_task_stat(struct seq_file unsigned long rsslim = 0; char tcomm[sizeof(task->comm)]; unsigned long flags; - struct pid *pgrp; state = *get_task_state(task); vsize = eip = esp = 0; @@ -430,7 +429,7 @@ static int do_task_stat(struct seq_file struct signal_struct *sig = task->signal; if (sig->tty) { - pgrp = tty_get_pgrp(sig->tty); + struct pid *pgrp = tty_get_pgrp(sig->tty); tty_pgrp = pid_nr_ns(pgrp, ns); put_pid(pgrp); tty_nr = new_encode_dev(tty_devnum(sig->tty)); _ Patches currently in -mm which might be from oleg@xxxxxxxxxx are git-hrt.patch kthread-call-wake_up_process-without-the-lock-being-held.patch mmap_region-cleanup-the-final-vma_merge-related-code.patch remove-unused-variable-from-send_signal.patch turn-legacy_queue-macro-into-static-inline-function.patch consolidate-checking-for-ignored-legacy-signals.patch consolidate-checking-for-ignored-legacy-signals-simplify.patch signals-do_signal_stop-use-signal_group_exit.patch signals-do_group_exit-use-signal_group_exit-more-consistently.patch lock_task_sighand-add-rcu-lock-unlock.patch k_getrusage-dont-take-rcu_read_lock.patch do_task_stat-dont-take-rcu_read_lock.patch signals-consolidate-checks-for-whether-or-not-to-ignore-a-signal.patch signals-clean-dequeue_signal-from-excess-checks-and-assignments.patch signals-consolidate-send_sigqueue-and-send_group_sigqueue.patch signals-cleanup-security_task_kill-usage-implementation.patch ptrace-introduce-task_detached-helper.patch ptrace-introduce-ptrace_reparented-helper.patch reparent_thread-use-same_thread_group.patch document-de_thread-with-exit_notify-connection.patch workqueues-shrink-cpu_populated_map-when-cpu-dies.patch workqueues-shrink-cpu_populated_map-when-cpu-dies-fix.patch cleanup_workqueue_thread-remove-the-unneeded-cpu-parameter.patch simplify-cpu_hotplug_begin-put_online_cpus.patch redo-locking-of-tty-pgrp.patch resume-tty-on-susp-and-fix-crnl-order-in-n_tty-line-discipline.patch tty_io-fix-remaining-pid-struct-locking.patch tty_io-fix-remaining-pid-struct-locking-small-cleanup.patch procfs-task-exe-symlink.patch procfs-task-exe-symlink-fix.patch procfs-task-exe-symlink-fix-2.patch free_pidmap-turn-it-into-free_pidmapstruct-upid.patch put_pid-make-sure-we-dont-free-the-live-pid.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html