seq/proc: modify seq_put_decimal_[u]ll to take a const char *, not char

[cascardo/linux.git] / fs / proc / array.c

diff --git a/fs/proc/array.c b/fs/proc/array.c
index 5e7d252..d25b446 100644 (file)
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -188,33 +188,26 @@ static inline void task_state(struct seq_file *m, struct pid_namespace *ns,
 
        seq_printf(m, "State:\t%s", get_task_state(p));
 
 
        seq_printf(m, "State:\t%s", get_task_state(p));
 

-       seq_puts(m, "\nTgid:\t");
-       seq_put_decimal_ull(m, 0, tgid);
-       seq_puts(m, "\nNgid:\t");
-       seq_put_decimal_ull(m, 0, ngid);
-       seq_puts(m, "\nPid:\t");
-       seq_put_decimal_ull(m, 0, pid_nr_ns(pid, ns));
-       seq_puts(m, "\nPPid:\t");
-       seq_put_decimal_ull(m, 0, ppid);
-       seq_puts(m, "\nTracerPid:\t");
-       seq_put_decimal_ull(m, 0, tpid);
-       seq_puts(m, "\nUid:");
-       seq_put_decimal_ull(m, '\t', from_kuid_munged(user_ns, cred->uid));
-       seq_put_decimal_ull(m, '\t', from_kuid_munged(user_ns, cred->euid));
-       seq_put_decimal_ull(m, '\t', from_kuid_munged(user_ns, cred->suid));
-       seq_put_decimal_ull(m, '\t', from_kuid_munged(user_ns, cred->fsuid));
-       seq_puts(m, "\nGid:");
-       seq_put_decimal_ull(m, '\t', from_kgid_munged(user_ns, cred->gid));
-       seq_put_decimal_ull(m, '\t', from_kgid_munged(user_ns, cred->egid));
-       seq_put_decimal_ull(m, '\t', from_kgid_munged(user_ns, cred->sgid));
-       seq_put_decimal_ull(m, '\t', from_kgid_munged(user_ns, cred->fsgid));
-       seq_puts(m, "\nFDSize:\t");
-       seq_put_decimal_ull(m, 0, max_fds);
+       seq_put_decimal_ull(m, "\nTgid:\t", tgid);
+       seq_put_decimal_ull(m, "\nNgid:\t", ngid);
+       seq_put_decimal_ull(m, "\nPid:\t", pid_nr_ns(pid, ns));
+       seq_put_decimal_ull(m, "\nPPid:\t", ppid);
+       seq_put_decimal_ull(m, "\nTracerPid:\t", tpid);
+       seq_put_decimal_ull(m, "\nUid:\t", from_kuid_munged(user_ns, cred->uid));
+       seq_put_decimal_ull(m, "\t", from_kuid_munged(user_ns, cred->euid));
+       seq_put_decimal_ull(m, "\t", from_kuid_munged(user_ns, cred->suid));
+       seq_put_decimal_ull(m, "\t", from_kuid_munged(user_ns, cred->fsuid));
+       seq_put_decimal_ull(m, "\nGid:\t", from_kgid_munged(user_ns, cred->gid));
+       seq_put_decimal_ull(m, "\t", from_kgid_munged(user_ns, cred->egid));
+       seq_put_decimal_ull(m, "\t", from_kgid_munged(user_ns, cred->sgid));
+       seq_put_decimal_ull(m, "\t", from_kgid_munged(user_ns, cred->fsgid));
+       seq_put_decimal_ull(m, "\nFDSize:\t", max_fds);

 
        seq_puts(m, "\nGroups:\t");
        group_info = cred->group_info;
        for (g = 0; g < group_info->ngroups; g++)
 
        seq_puts(m, "\nGroups:\t");
        group_info = cred->group_info;
        for (g = 0; g < group_info->ngroups; g++)

-               seq_put_decimal_ull(m, g ? ' ' : 0, from_kgid_munged(user_ns, GROUP_AT(group_info, g)));
+               seq_put_decimal_ull(m, g ? " " : "",
+                                   from_kgid_munged(user_ns, GROUP_AT(group_info, g)));

        put_cred(cred);
        /* Trailing space shouldn't have been added in the first place. */
        seq_putc(m, ' ');
        put_cred(cred);
        /* Trailing space shouldn't have been added in the first place. */
        seq_putc(m, ' ');


@@ -222,16 +215,16 @@ static inline void task_state(struct seq_file *m, struct pid_namespace *ns,
 #ifdef CONFIG_PID_NS
        seq_puts(m, "\nNStgid:");
        for (g = ns->level; g <= pid->level; g++)
 #ifdef CONFIG_PID_NS
        seq_puts(m, "\nNStgid:");
        for (g = ns->level; g <= pid->level; g++)

-               seq_put_decimal_ull(m, '\t', task_tgid_nr_ns(p, pid->numbers[g].ns));
+               seq_put_decimal_ull(m, "\t", task_tgid_nr_ns(p, pid->numbers[g].ns));

        seq_puts(m, "\nNSpid:");
        for (g = ns->level; g <= pid->level; g++)
        seq_puts(m, "\nNSpid:");
        for (g = ns->level; g <= pid->level; g++)

-               seq_put_decimal_ull(m, '\t', task_pid_nr_ns(p, pid->numbers[g].ns));
+               seq_put_decimal_ull(m, "\t", task_pid_nr_ns(p, pid->numbers[g].ns));

        seq_puts(m, "\nNSpgid:");
        for (g = ns->level; g <= pid->level; g++)
        seq_puts(m, "\nNSpgid:");
        for (g = ns->level; g <= pid->level; g++)

-               seq_put_decimal_ull(m, '\t', task_pgrp_nr_ns(p, pid->numbers[g].ns));
+               seq_put_decimal_ull(m, "\t", task_pgrp_nr_ns(p, pid->numbers[g].ns));

        seq_puts(m, "\nNSsid:");
        for (g = ns->level; g <= pid->level; g++)
        seq_puts(m, "\nNSsid:");
        for (g = ns->level; g <= pid->level; g++)

-               seq_put_decimal_ull(m, '\t', task_session_nr_ns(p, pid->numbers[g].ns));
+               seq_put_decimal_ull(m, "\t", task_session_nr_ns(p, pid->numbers[g].ns));

 #endif
        seq_putc(m, '\n');
 }
 #endif
        seq_putc(m, '\n');
 }


@@ -300,11 +293,9 @@ static inline void task_sig(struct seq_file *m, struct task_struct *p)
                unlock_task_sighand(p, &flags);
        }
 
                unlock_task_sighand(p, &flags);
        }
 

-       seq_puts(m, "Threads:\t");
-       seq_put_decimal_ull(m, 0, num_threads);
-       seq_puts(m, "\nSigQ:\t");
-       seq_put_decimal_ull(m, 0, qsize);
-       seq_put_decimal_ull(m, '/', qlim);
+       seq_put_decimal_ull(m, "Threads:\t", num_threads);
+       seq_put_decimal_ull(m, "\nSigQ:\t", qsize);
+       seq_put_decimal_ull(m, "/", qlim);

 
        /* render them all */
        render_sigset_t(m, "\nSigPnd:\t", &pending);
 
        /* render them all */
        render_sigset_t(m, "\nSigPnd:\t", &pending);


@@ -352,8 +343,7 @@ static inline void task_cap(struct seq_file *m, struct task_struct *p)
 static inline void task_seccomp(struct seq_file *m, struct task_struct *p)
 {
 #ifdef CONFIG_SECCOMP
 static inline void task_seccomp(struct seq_file *m, struct task_struct *p)
 {
 #ifdef CONFIG_SECCOMP

-       seq_puts(m, "Seccomp:\t");
-       seq_put_decimal_ull(m, 0, p->seccomp.mode);
+       seq_put_decimal_ull(m, "Seccomp:\t", p->seccomp.mode);

        seq_putc(m, '\n');
 #endif
 }
        seq_putc(m, '\n');
 #endif
 }


@@ -361,10 +351,8 @@ static inline void task_seccomp(struct seq_file *m, struct task_struct *p)
 static inline void task_context_switch_counts(struct seq_file *m,
                                                struct task_struct *p)
 {
 static inline void task_context_switch_counts(struct seq_file *m,
                                                struct task_struct *p)
 {

-       seq_puts(m, "voluntary_ctxt_switches:\t");
-       seq_put_decimal_ull(m, 0, p->nvcsw);
-       seq_puts(m, "\nnonvoluntary_ctxt_switches:\t");
-       seq_put_decimal_ull(m, 0, p->nivcsw);
+       seq_put_decimal_ull(m, "voluntary_ctxt_switches:\t", p->nvcsw);
+       seq_put_decimal_ull(m, "\nnonvoluntary_ctxt_switches:\t", p->nivcsw);

        seq_putc(m, '\n');
 }
 
        seq_putc(m, '\n');
 }
 


@@ -497,41 +485,41 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
        start_time = nsec_to_clock_t(task->real_start_time);
 
        seq_printf(m, "%d (%s) %c", pid_nr_ns(pid, ns), tcomm, state);
        start_time = nsec_to_clock_t(task->real_start_time);
 
        seq_printf(m, "%d (%s) %c", pid_nr_ns(pid, ns), tcomm, state);

-       seq_put_decimal_ll(m, ' ', ppid);
-       seq_put_decimal_ll(m, ' ', pgid);
-       seq_put_decimal_ll(m, ' ', sid);
-       seq_put_decimal_ll(m, ' ', tty_nr);
-       seq_put_decimal_ll(m, ' ', tty_pgrp);
-       seq_put_decimal_ull(m, ' ', task->flags);
-       seq_put_decimal_ull(m, ' ', min_flt);
-       seq_put_decimal_ull(m, ' ', cmin_flt);
-       seq_put_decimal_ull(m, ' ', maj_flt);
-       seq_put_decimal_ull(m, ' ', cmaj_flt);
-       seq_put_decimal_ull(m, ' ', cputime_to_clock_t(utime));
-       seq_put_decimal_ull(m, ' ', cputime_to_clock_t(stime));
-       seq_put_decimal_ll(m, ' ', cputime_to_clock_t(cutime));
-       seq_put_decimal_ll(m, ' ', cputime_to_clock_t(cstime));
-       seq_put_decimal_ll(m, ' ', priority);
-       seq_put_decimal_ll(m, ' ', nice);
-       seq_put_decimal_ll(m, ' ', num_threads);
-       seq_put_decimal_ull(m, ' ', 0);
-       seq_put_decimal_ull(m, ' ', start_time);
-       seq_put_decimal_ull(m, ' ', vsize);
-       seq_put_decimal_ull(m, ' ', mm ? get_mm_rss(mm) : 0);
-       seq_put_decimal_ull(m, ' ', rsslim);
-       seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->start_code : 1) : 0);
-       seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->end_code : 1) : 0);
-       seq_put_decimal_ull(m, ' ', (permitted && mm) ? mm->start_stack : 0);
-       seq_put_decimal_ull(m, ' ', esp);
-       seq_put_decimal_ull(m, ' ', eip);
+       seq_put_decimal_ll(m, " ", ppid);
+       seq_put_decimal_ll(m, " ", pgid);
+       seq_put_decimal_ll(m, " ", sid);
+       seq_put_decimal_ll(m, " ", tty_nr);
+       seq_put_decimal_ll(m, " ", tty_pgrp);
+       seq_put_decimal_ull(m, " ", task->flags);
+       seq_put_decimal_ull(m, " ", min_flt);
+       seq_put_decimal_ull(m, " ", cmin_flt);
+       seq_put_decimal_ull(m, " ", maj_flt);
+       seq_put_decimal_ull(m, " ", cmaj_flt);
+       seq_put_decimal_ull(m, " ", cputime_to_clock_t(utime));
+       seq_put_decimal_ull(m, " ", cputime_to_clock_t(stime));
+       seq_put_decimal_ll(m, " ", cputime_to_clock_t(cutime));
+       seq_put_decimal_ll(m, " ", cputime_to_clock_t(cstime));
+       seq_put_decimal_ll(m, " ", priority);
+       seq_put_decimal_ll(m, " ", nice);
+       seq_put_decimal_ll(m, " ", num_threads);
+       seq_put_decimal_ull(m, " ", 0);
+       seq_put_decimal_ull(m, " ", start_time);
+       seq_put_decimal_ull(m, " ", vsize);
+       seq_put_decimal_ull(m, " ", mm ? get_mm_rss(mm) : 0);
+       seq_put_decimal_ull(m, " ", rsslim);
+       seq_put_decimal_ull(m, " ", mm ? (permitted ? mm->start_code : 1) : 0);
+       seq_put_decimal_ull(m, " ", mm ? (permitted ? mm->end_code : 1) : 0);
+       seq_put_decimal_ull(m, " ", (permitted && mm) ? mm->start_stack : 0);
+       seq_put_decimal_ull(m, " ", esp);
+       seq_put_decimal_ull(m, " ", eip);

        /* The signal information here is obsolete.
         * It must be decimal for Linux 2.0 compatibility.
         * Use /proc/#/status for real-time signals.
         */
        /* The signal information here is obsolete.
         * It must be decimal for Linux 2.0 compatibility.
         * Use /proc/#/status for real-time signals.
         */

-       seq_put_decimal_ull(m, ' ', task->pending.signal.sig[0] & 0x7fffffffUL);
-       seq_put_decimal_ull(m, ' ', task->blocked.sig[0] & 0x7fffffffUL);
-       seq_put_decimal_ull(m, ' ', sigign.sig[0] & 0x7fffffffUL);
-       seq_put_decimal_ull(m, ' ', sigcatch.sig[0] & 0x7fffffffUL);
+       seq_put_decimal_ull(m, " ", task->pending.signal.sig[0] & 0x7fffffffUL);
+       seq_put_decimal_ull(m, " ", task->blocked.sig[0] & 0x7fffffffUL);
+       seq_put_decimal_ull(m, " ", sigign.sig[0] & 0x7fffffffUL);
+       seq_put_decimal_ull(m, " ", sigcatch.sig[0] & 0x7fffffffUL);

 
        /*
         * We used to output the absolute kernel address, but that's an
 
        /*
         * We used to output the absolute kernel address, but that's an


@@ -545,31 +533,31 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
        else
                seq_puts(m, " 0");
 
        else
                seq_puts(m, " 0");
 

-       seq_put_decimal_ull(m, ' ', 0);
-       seq_put_decimal_ull(m, ' ', 0);
-       seq_put_decimal_ll(m, ' ', task->exit_signal);
-       seq_put_decimal_ll(m, ' ', task_cpu(task));
-       seq_put_decimal_ull(m, ' ', task->rt_priority);
-       seq_put_decimal_ull(m, ' ', task->policy);
-       seq_put_decimal_ull(m, ' ', delayacct_blkio_ticks(task));
-       seq_put_decimal_ull(m, ' ', cputime_to_clock_t(gtime));
-       seq_put_decimal_ll(m, ' ', cputime_to_clock_t(cgtime));
+       seq_put_decimal_ull(m, " ", 0);
+       seq_put_decimal_ull(m, " ", 0);
+       seq_put_decimal_ll(m, " ", task->exit_signal);
+       seq_put_decimal_ll(m, " ", task_cpu(task));
+       seq_put_decimal_ull(m, " ", task->rt_priority);
+       seq_put_decimal_ull(m, " ", task->policy);
+       seq_put_decimal_ull(m, " ", delayacct_blkio_ticks(task));
+       seq_put_decimal_ull(m, " ", cputime_to_clock_t(gtime));
+       seq_put_decimal_ll(m, " ", cputime_to_clock_t(cgtime));

 
        if (mm && permitted) {
 
        if (mm && permitted) {

-               seq_put_decimal_ull(m, ' ', mm->start_data);
-               seq_put_decimal_ull(m, ' ', mm->end_data);
-               seq_put_decimal_ull(m, ' ', mm->start_brk);
-               seq_put_decimal_ull(m, ' ', mm->arg_start);
-               seq_put_decimal_ull(m, ' ', mm->arg_end);
-               seq_put_decimal_ull(m, ' ', mm->env_start);
-               seq_put_decimal_ull(m, ' ', mm->env_end);
+               seq_put_decimal_ull(m, " ", mm->start_data);
+               seq_put_decimal_ull(m, " ", mm->end_data);
+               seq_put_decimal_ull(m, " ", mm->start_brk);
+               seq_put_decimal_ull(m, " ", mm->arg_start);
+               seq_put_decimal_ull(m, " ", mm->arg_end);
+               seq_put_decimal_ull(m, " ", mm->env_start);
+               seq_put_decimal_ull(m, " ", mm->env_end);

        } else
        } else

-               seq_printf(m, " 0 0 0 0 0 0 0");
+               seq_puts(m, " 0 0 0 0 0 0 0");

 
        if (permitted)
 
        if (permitted)

-               seq_put_decimal_ll(m, ' ', task->exit_code);
+               seq_put_decimal_ll(m, " ", task->exit_code);

        else
        else

-               seq_put_decimal_ll(m, ' ', 0);
+               seq_puts(m, " 0");

 
        seq_putc(m, '\n');
        if (mm)
 
        seq_putc(m, '\n');
        if (mm)


@@ -605,13 +593,13 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
         * seq_printf(m, "%lu %lu %lu %lu 0 %lu 0\n",
         *               size, resident, shared, text, data);
         */
         * seq_printf(m, "%lu %lu %lu %lu 0 %lu 0\n",
         *               size, resident, shared, text, data);
         */

-       seq_put_decimal_ull(m, 0, size);
-       seq_put_decimal_ull(m, ' ', resident);
-       seq_put_decimal_ull(m, ' ', shared);
-       seq_put_decimal_ull(m, ' ', text);
-       seq_put_decimal_ull(m, ' ', 0);
-       seq_put_decimal_ull(m, ' ', data);
-       seq_put_decimal_ull(m, ' ', 0);
+       seq_put_decimal_ull(m, "", size);
+       seq_put_decimal_ull(m, " ", resident);
+       seq_put_decimal_ull(m, " ", shared);
+       seq_put_decimal_ull(m, " ", text);
+       seq_put_decimal_ull(m, " ", 0);
+       seq_put_decimal_ull(m, " ", data);
+       seq_put_decimal_ull(m, " ", 0);

        seq_putc(m, '\n');
 
        return 0;
        seq_putc(m, '\n');
 
        return 0;