3 files changed, 87 insertions, 48 deletions

diff --git a/fs/proc/array.c b/fs/proc/array.c
index 1295a00ca316..fd02a9ebfc30 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -99,8 +99,8 @@ static inline void task_name(struct seq_file *m, struct task_struct *p)
         buf = m->buf + m->count;
 
         /* Ignore error for now */
-        string_escape_str(tcomm, &buf, m->size - m->count,
-                          ESCAPE_SPACE | ESCAPE_SPECIAL, "\n\\");
+        buf += string_escape_str(tcomm, buf, m->size - m->count,
+                                 ESCAPE_SPACE | ESCAPE_SPECIAL, "\n\\");
 
         m->count = buf - m->buf;
         seq_putc(m, '\n');
@@ -188,6 +188,24 @@ static inline void task_state(struct seq_file *m, struct pid_namespace *ns,
                            from_kgid_munged(user_ns, GROUP_AT(group_info, g)));
         put_cred(cred);
 
+#ifdef CONFIG_PID_NS
+        seq_puts(m, "\nNStgid:");
+        for (g = ns->level; g <= pid->level; g++)
+                seq_printf(m, "\t%d",
+                        task_tgid_nr_ns(p, pid->numbers[g].ns));
+        seq_puts(m, "\nNSpid:");
+        for (g = ns->level; g <= pid->level; g++)
+                seq_printf(m, "\t%d",
+                        task_pid_nr_ns(p, pid->numbers[g].ns));
+        seq_puts(m, "\nNSpgid:");
+        for (g = ns->level; g <= pid->level; g++)
+                seq_printf(m, "\t%d",
+                        task_pgrp_nr_ns(p, pid->numbers[g].ns));
+        seq_puts(m, "\nNSsid:");
+        for (g = ns->level; g <= pid->level; g++)
+                seq_printf(m, "\t%d",
+                        task_session_nr_ns(p, pid->numbers[g].ns));
+#endif
         seq_putc(m, '\n');
 }
 
@@ -614,7 +632,9 @@ static int children_seq_show(struct seq_file *seq, void *v)
         pid_t pid;
 
         pid = pid_nr_ns(v, inode->i_sb->s_fs_info);
-        return seq_printf(seq, "%d ", pid);
+        seq_printf(seq, "%d ", pid);
+
+        return 0;
 }
 
 static void *children_seq_start(struct seq_file *seq, loff_t *pos)
diff --git a/fs/proc/base.c b/fs/proc/base.c
index 3f3d7aeb0712..7a3b82f986dd 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -238,13 +238,15 @@ static int proc_pid_wchan(struct seq_file *m, struct pid_namespace *ns,
 
         wchan = get_wchan(task);
 
-        if (lookup_symbol_name(wchan, symname) < 0)
+        if (lookup_symbol_name(wchan, symname) < 0) {
                 if (!ptrace_may_access(task, PTRACE_MODE_READ))
                         return 0;
-                else
-                        return seq_printf(m, "%lu", wchan);
-        else
-                return seq_printf(m, "%s", symname);
+                seq_printf(m, "%lu", wchan);
+        } else {
+                seq_printf(m, "%s", symname);
+        }
+
+        return 0;
 }
 #endif /* CONFIG_KALLSYMS */
 
@@ -309,10 +311,12 @@ static int proc_pid_stack(struct seq_file *m, struct pid_namespace *ns,
 static int proc_pid_schedstat(struct seq_file *m, struct pid_namespace *ns,
                               struct pid *pid, struct task_struct *task)
 {
-        return seq_printf(m, "%llu %llu %lu\n",
-                        (unsigned long long)task->se.sum_exec_runtime,
-                        (unsigned long long)task->sched_info.run_delay,
-                        task->sched_info.pcount);
+        seq_printf(m, "%llu %llu %lu\n",
+                   (unsigned long long)task->se.sum_exec_runtime,
+                   (unsigned long long)task->sched_info.run_delay,
+                   task->sched_info.pcount);
+
+        return 0;
 }
 #endif
 
@@ -387,7 +391,9 @@ static int proc_oom_score(struct seq_file *m, struct pid_namespace *ns,
                 points = oom_badness(task, NULL, NULL, totalpages) *
                                                 1000 / totalpages;
         read_unlock(&tasklist_lock);
-        return seq_printf(m, "%lu\n", points);
+        seq_printf(m, "%lu\n", points);
+
+        return 0;
 }
 
 struct limit_names {
@@ -432,15 +438,15 @@ static int proc_pid_limits(struct seq_file *m, struct pid_namespace *ns,
          * print the file header
          */
        seq_printf(m, "%-25s %-20s %-20s %-10s\n",
-                        "Limit", "Soft Limit", "Hard Limit", "Units");
+                  "Limit", "Soft Limit", "Hard Limit", "Units");
 
         for (i = 0; i < RLIM_NLIMITS; i++) {
                 if (rlim[i].rlim_cur == RLIM_INFINITY)
                         seq_printf(m, "%-25s %-20s ",
-                                         lnames[i].name, "unlimited");
+                                   lnames[i].name, "unlimited");
                 else
                         seq_printf(m, "%-25s %-20lu ",
-                                         lnames[i].name, rlim[i].rlim_cur);
+                                   lnames[i].name, rlim[i].rlim_cur);
 
                 if (rlim[i].rlim_max == RLIM_INFINITY)
                         seq_printf(m, "%-20s ", "unlimited");
@@ -462,7 +468,9 @@ static int proc_pid_syscall(struct seq_file *m, struct pid_namespace *ns,
 {
         long nr;
         unsigned long args[6], sp, pc;
-        int res = lock_trace(task);
+        int res;
+
+        res = lock_trace(task);
         if (res)
                 return res;
 
@@ -477,7 +485,8 @@ static int proc_pid_syscall(struct seq_file *m, struct pid_namespace *ns,
                        args[0], args[1], args[2], args[3], args[4], args[5],
                        sp, pc);
         unlock_trace(task);
-        return res;
+
+        return 0;
 }
 #endif /* CONFIG_HAVE_ARCH_TRACEHOOK */
 
@@ -2002,12 +2011,13 @@ static int show_timer(struct seq_file *m, void *v)
         notify = timer->it_sigev_notify;
 
         seq_printf(m, "ID: %d\n", timer->it_id);
-        seq_printf(m, "signal: %d/%p\n", timer->sigq->info.si_signo,
-                        timer->sigq->info.si_value.sival_ptr);
+        seq_printf(m, "signal: %d/%p\n",
+                   timer->sigq->info.si_signo,
+                   timer->sigq->info.si_value.sival_ptr);
         seq_printf(m, "notify: %s/%s.%d\n",
-                nstr[notify & ~SIGEV_THREAD_ID],
-                (notify & SIGEV_THREAD_ID) ? "tid" : "pid",
-                pid_nr_ns(timer->it_pid, tp->ns));
+                   nstr[notify & ~SIGEV_THREAD_ID],
+                   (notify & SIGEV_THREAD_ID) ? "tid" : "pid",
+                   pid_nr_ns(timer->it_pid, tp->ns));
         seq_printf(m, "ClockID: %d\n", timer->it_clock);
 
         return 0;
@@ -2352,21 +2362,23 @@ static int do_io_accounting(struct task_struct *task, struct seq_file *m, int wh
 
                 unlock_task_sighand(task, &flags);
         }
-        result = seq_printf(m,
-                        "rchar: %llu\n"
-                        "wchar: %llu\n"
-                        "syscr: %llu\n"
-                        "syscw: %llu\n"
-                        "read_bytes: %llu\n"
-                        "write_bytes: %llu\n"
-                        "cancelled_write_bytes: %llu\n",
-                        (unsigned long long)acct.rchar,
-                        (unsigned long long)acct.wchar,
-                        (unsigned long long)acct.syscr,
-                        (unsigned long long)acct.syscw,
-                        (unsigned long long)acct.read_bytes,
-                        (unsigned long long)acct.write_bytes,
-                        (unsigned long long)acct.cancelled_write_bytes);
+        seq_printf(m,
+                   "rchar: %llu\n"
+                   "wchar: %llu\n"
+                   "syscr: %llu\n"
+                   "syscw: %llu\n"
+                   "read_bytes: %llu\n"
+                   "write_bytes: %llu\n"
+                   "cancelled_write_bytes: %llu\n",
+                   (unsigned long long)acct.rchar,
+                   (unsigned long long)acct.wchar,
+                   (unsigned long long)acct.syscr,
+                   (unsigned long long)acct.syscw,
+                   (unsigned long long)acct.read_bytes,
+                   (unsigned long long)acct.write_bytes,
+                   (unsigned long long)acct.cancelled_write_bytes);
+        result = 0;
+
 out_unlock:
         mutex_unlock(&task->signal->cred_guard_mutex);
         return result;
diff --git a/fs/proc/fd.c b/fs/proc/fd.c
index 8e5ad83b629a..af84ad04df77 100644
--- a/fs/proc/fd.c
+++ b/fs/proc/fd.c
@@ -8,6 +8,7 @@
 #include <linux/security.h>
 #include <linux/file.h>
 #include <linux/seq_file.h>
+#include <linux/fs.h>
 
 #include <linux/proc_fs.h>
 
@@ -48,17 +49,23 @@ static int seq_show(struct seq_file *m, void *v)
                 put_files_struct(files);
         }
 
-        if (!ret) {
-                seq_printf(m, "pos:\t%lli\nflags:\t0%o\nmnt_id:\t%i\n",
-                           (long long)file->f_pos, f_flags,
-                           real_mount(file->f_path.mnt)->mnt_id);
-                if (file->f_op->show_fdinfo)
-                        file->f_op->show_fdinfo(m, file);
-                ret = seq_has_overflowed(m);
-                fput(file);
-        }
+        if (ret)
+                return ret;
 
-        return ret;
+        seq_printf(m, "pos:\t%lli\nflags:\t0%o\nmnt_id:\t%i\n",
+                   (long long)file->f_pos, f_flags,
+                   real_mount(file->f_path.mnt)->mnt_id);
+
+        show_fd_locks(m, file, files);
+        if (seq_has_overflowed(m))
+                goto out;
+
+        if (file->f_op->show_fdinfo)
+                file->f_op->show_fdinfo(m, file);
+
+out:
+        fput(file);
+        return 0;
 }
 
 static int seq_fdinfo_open(struct inode *inode, struct file *file)