The patch titled Subject: proc: convert /proc/$PID/cmdline to seq_file interface has been added to the -mm tree. Its filename is proc-convert-proc-pid-cmdline-to-seq_file-interface.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/proc-convert-proc-pid-cmdline-to-seq_file-interface.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/proc-convert-proc-pid-cmdline-to-seq_file-interface.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 *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Alexey Dobriyan <adobriyan@xxxxxxxxx> Subject: proc: convert /proc/$PID/cmdline to seq_file interface Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/proc/base.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff -puN fs/proc/base.c~proc-convert-proc-pid-cmdline-to-seq_file-interface fs/proc/base.c --- a/fs/proc/base.c~proc-convert-proc-pid-cmdline-to-seq_file-interface +++ a/fs/proc/base.c @@ -200,9 +200,16 @@ static int proc_root_link(struct dentry return result; } -static int proc_pid_cmdline(struct task_struct *task, char *buffer) +static int proc_pid_cmdline(struct seq_file *m, struct pid_namespace *ns, + struct pid *pid, struct task_struct *task) { - return get_cmdline(task, buffer, PAGE_SIZE); + /* + * Rely on struct seq_operations::show() being called once + * per internal buffer allocation. See single_open(), traverse(). + */ + BUG_ON(m->size < PAGE_SIZE); + m->count += get_cmdline(task, m->buf, PAGE_SIZE); + return 0; } static int proc_pid_auxv(struct seq_file *m, struct pid_namespace *ns, @@ -2567,7 +2574,7 @@ static const struct pid_entry tgid_base_ #ifdef CONFIG_HAVE_ARCH_TRACEHOOK ONE("syscall", S_IRUSR, proc_pid_syscall), #endif - INF("cmdline", S_IRUGO, proc_pid_cmdline), + ONE("cmdline", S_IRUGO, proc_pid_cmdline), ONE("stat", S_IRUGO, proc_tgid_stat), ONE("statm", S_IRUGO, proc_pid_statm), REG("maps", S_IRUGO, proc_pid_maps_operations), @@ -2903,7 +2910,7 @@ static const struct pid_entry tid_base_s #ifdef CONFIG_HAVE_ARCH_TRACEHOOK ONE("syscall", S_IRUSR, proc_pid_syscall), #endif - INF("cmdline", S_IRUGO, proc_pid_cmdline), + ONE("cmdline", S_IRUGO, proc_pid_cmdline), ONE("stat", S_IRUGO, proc_tid_stat), ONE("statm", S_IRUGO, proc_pid_statm), REG("maps", S_IRUGO, proc_tid_maps_operations), _ Patches currently in -mm which might be from adobriyan@xxxxxxxxx are lib-test-kstrtoxc-use-array_size-instead-of-sizeof-sizeof.patch proc-add-and-remove-proc-entry-create-checks.patch proc-faster-proc-pid-lookup.patch proc-make-proc_subdir_lock-static.patch proc-remove-proc_tty_ldisc-variable.patch proc-remove-proc_tty_ldisc-variable-fix.patch proc-more-const-char-pointers.patch proc-convert-proc-pid-auxv-to-seq_file-interface.patch proc-convert-proc-pid-limits-to-seq_file-interface.patch proc-convert-proc-pid-syscall-to-seq_file-interface.patch proc-convert-proc-pid-cmdline-to-seq_file-interface.patch proc-convert-proc-pid-wchan-to-seq_file-interface.patch proc-convert-proc-pid-schedstat-to-seq_file-interface.patch proc-convert-proc-pid-oom_score-to-seq_file-interface.patch proc-convert-proc-pid-io-to-seq_file-interface.patch proc-convert-proc-pid-hardwall-to-seq_file-interface.patch proc-remove-inf-macro.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