Skip to content
This repository was archived by the owner on Dec 2, 2020. It is now read-only.

Commit 75ba1d0

Browse files
JoePerchestorvalds
JoePerches
authored and
torvalds
committed
seq/proc: modify seq_put_decimal_[u]ll to take a const char *, not char
Allow some seq_puts removals by taking a string instead of a single char. [[email protected]: update vmstat_show(), per Joe] Link: http://lkml.kernel.org/r/667e1cf3d436de91a5698170a1e98d882905e956.1470704995.git.joe@perches.com Signed-off-by: Joe Perches <[email protected]> Cc: Joe Perches <[email protected]> Cc: Andi Kleen <[email protected]> Cc: Al Viro <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent f7a5f13 commit 75ba1d0

File tree

5 files changed

+154
-136
lines changed

5 files changed

+154
-136
lines changed

‎fs/proc/array.c

+83-95
Original file line numberDiff line numberDiff line change
@@ -188,50 +188,43 @@ static inline void task_state(struct seq_file *m, struct pid_namespace *ns,
188188

189189
seq_printf(m, "State:\t%s", get_task_state(p));
190190

191-
seq_puts(m, "\nTgid:\t");
192-
seq_put_decimal_ull(m, 0, tgid);
193-
seq_puts(m, "\nNgid:\t");
194-
seq_put_decimal_ull(m, 0, ngid);
195-
seq_puts(m, "\nPid:\t");
196-
seq_put_decimal_ull(m, 0, pid_nr_ns(pid, ns));
197-
seq_puts(m, "\nPPid:\t");
198-
seq_put_decimal_ull(m, 0, ppid);
199-
seq_puts(m, "\nTracerPid:\t");
200-
seq_put_decimal_ull(m, 0, tpid);
201-
seq_puts(m, "\nUid:");
202-
seq_put_decimal_ull(m, '\t', from_kuid_munged(user_ns, cred->uid));
203-
seq_put_decimal_ull(m, '\t', from_kuid_munged(user_ns, cred->euid));
204-
seq_put_decimal_ull(m, '\t', from_kuid_munged(user_ns, cred->suid));
205-
seq_put_decimal_ull(m, '\t', from_kuid_munged(user_ns, cred->fsuid));
206-
seq_puts(m, "\nGid:");
207-
seq_put_decimal_ull(m, '\t', from_kgid_munged(user_ns, cred->gid));
208-
seq_put_decimal_ull(m, '\t', from_kgid_munged(user_ns, cred->egid));
209-
seq_put_decimal_ull(m, '\t', from_kgid_munged(user_ns, cred->sgid));
210-
seq_put_decimal_ull(m, '\t', from_kgid_munged(user_ns, cred->fsgid));
211-
seq_puts(m, "\nFDSize:\t");
212-
seq_put_decimal_ull(m, 0, max_fds);
191+
seq_put_decimal_ull(m, "\nTgid:\t", tgid);
192+
seq_put_decimal_ull(m, "\nNgid:\t", ngid);
193+
seq_put_decimal_ull(m, "\nPid:\t", pid_nr_ns(pid, ns));
194+
seq_put_decimal_ull(m, "\nPPid:\t", ppid);
195+
seq_put_decimal_ull(m, "\nTracerPid:\t", tpid);
196+
seq_put_decimal_ull(m, "\nUid:\t", from_kuid_munged(user_ns, cred->uid));
197+
seq_put_decimal_ull(m, "\t", from_kuid_munged(user_ns, cred->euid));
198+
seq_put_decimal_ull(m, "\t", from_kuid_munged(user_ns, cred->suid));
199+
seq_put_decimal_ull(m, "\t", from_kuid_munged(user_ns, cred->fsuid));
200+
seq_put_decimal_ull(m, "\nGid:\t", from_kgid_munged(user_ns, cred->gid));
201+
seq_put_decimal_ull(m, "\t", from_kgid_munged(user_ns, cred->egid));
202+
seq_put_decimal_ull(m, "\t", from_kgid_munged(user_ns, cred->sgid));
203+
seq_put_decimal_ull(m, "\t", from_kgid_munged(user_ns, cred->fsgid));
204+
seq_put_decimal_ull(m, "\nFDSize:\t", max_fds);
213205

214206
seq_puts(m, "\nGroups:\t");
215207
group_info = cred->group_info;
216208
for (g = 0; g < group_info->ngroups; g++)
217-
seq_put_decimal_ull(m, g ? ' ' : 0, from_kgid_munged(user_ns, GROUP_AT(group_info, g)));
209+
seq_put_decimal_ull(m, g ? " " : "",
210+
from_kgid_munged(user_ns, GROUP_AT(group_info, g)));
218211
put_cred(cred);
219212
/* Trailing space shouldn't have been added in the first place. */
220213
seq_putc(m, ' ');
221214

222215
#ifdef CONFIG_PID_NS
223216
seq_puts(m, "\nNStgid:");
224217
for (g = ns->level; g <= pid->level; g++)
225-
seq_put_decimal_ull(m, '\t', task_tgid_nr_ns(p, pid->numbers[g].ns));
218+
seq_put_decimal_ull(m, "\t", task_tgid_nr_ns(p, pid->numbers[g].ns));
226219
seq_puts(m, "\nNSpid:");
227220
for (g = ns->level; g <= pid->level; g++)
228-
seq_put_decimal_ull(m, '\t', task_pid_nr_ns(p, pid->numbers[g].ns));
221+
seq_put_decimal_ull(m, "\t", task_pid_nr_ns(p, pid->numbers[g].ns));
229222
seq_puts(m, "\nNSpgid:");
230223
for (g = ns->level; g <= pid->level; g++)
231-
seq_put_decimal_ull(m, '\t', task_pgrp_nr_ns(p, pid->numbers[g].ns));
224+
seq_put_decimal_ull(m, "\t", task_pgrp_nr_ns(p, pid->numbers[g].ns));
232225
seq_puts(m, "\nNSsid:");
233226
for (g = ns->level; g <= pid->level; g++)
234-
seq_put_decimal_ull(m, '\t', task_session_nr_ns(p, pid->numbers[g].ns));
227+
seq_put_decimal_ull(m, "\t", task_session_nr_ns(p, pid->numbers[g].ns));
235228
#endif
236229
seq_putc(m, '\n');
237230
}
@@ -300,11 +293,9 @@ static inline void task_sig(struct seq_file *m, struct task_struct *p)
300293
unlock_task_sighand(p, &flags);
301294
}
302295

303-
seq_puts(m, "Threads:\t");
304-
seq_put_decimal_ull(m, 0, num_threads);
305-
seq_puts(m, "\nSigQ:\t");
306-
seq_put_decimal_ull(m, 0, qsize);
307-
seq_put_decimal_ull(m, '/', qlim);
296+
seq_put_decimal_ull(m, "Threads:\t", num_threads);
297+
seq_put_decimal_ull(m, "\nSigQ:\t", qsize);
298+
seq_put_decimal_ull(m, "/", qlim);
308299

309300
/* render them all */
310301
render_sigset_t(m, "\nSigPnd:\t", &pending);
@@ -352,19 +343,16 @@ static inline void task_cap(struct seq_file *m, struct task_struct *p)
352343
static inline void task_seccomp(struct seq_file *m, struct task_struct *p)
353344
{
354345
#ifdef CONFIG_SECCOMP
355-
seq_puts(m, "Seccomp:\t");
356-
seq_put_decimal_ull(m, 0, p->seccomp.mode);
346+
seq_put_decimal_ull(m, "Seccomp:\t", p->seccomp.mode);
357347
seq_putc(m, '\n');
358348
#endif
359349
}
360350

361351
static inline void task_context_switch_counts(struct seq_file *m,
362352
struct task_struct *p)
363353
{
364-
seq_puts(m, "voluntary_ctxt_switches:\t");
365-
seq_put_decimal_ull(m, 0, p->nvcsw);
366-
seq_puts(m, "\nnonvoluntary_ctxt_switches:\t");
367-
seq_put_decimal_ull(m, 0, p->nivcsw);
354+
seq_put_decimal_ull(m, "voluntary_ctxt_switches:\t", p->nvcsw);
355+
seq_put_decimal_ull(m, "\nnonvoluntary_ctxt_switches:\t", p->nivcsw);
368356
seq_putc(m, '\n');
369357
}
370358

@@ -497,41 +485,41 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
497485
start_time = nsec_to_clock_t(task->real_start_time);
498486

499487
seq_printf(m, "%d (%s) %c", pid_nr_ns(pid, ns), tcomm, state);
500-
seq_put_decimal_ll(m, ' ', ppid);
501-
seq_put_decimal_ll(m, ' ', pgid);
502-
seq_put_decimal_ll(m, ' ', sid);
503-
seq_put_decimal_ll(m, ' ', tty_nr);
504-
seq_put_decimal_ll(m, ' ', tty_pgrp);
505-
seq_put_decimal_ull(m, ' ', task->flags);
506-
seq_put_decimal_ull(m, ' ', min_flt);
507-
seq_put_decimal_ull(m, ' ', cmin_flt);
508-
seq_put_decimal_ull(m, ' ', maj_flt);
509-
seq_put_decimal_ull(m, ' ', cmaj_flt);
510-
seq_put_decimal_ull(m, ' ', cputime_to_clock_t(utime));
511-
seq_put_decimal_ull(m, ' ', cputime_to_clock_t(stime));
512-
seq_put_decimal_ll(m, ' ', cputime_to_clock_t(cutime));
513-
seq_put_decimal_ll(m, ' ', cputime_to_clock_t(cstime));
514-
seq_put_decimal_ll(m, ' ', priority);
515-
seq_put_decimal_ll(m, ' ', nice);
516-
seq_put_decimal_ll(m, ' ', num_threads);
517-
seq_put_decimal_ull(m, ' ', 0);
518-
seq_put_decimal_ull(m, ' ', start_time);
519-
seq_put_decimal_ull(m, ' ', vsize);
520-
seq_put_decimal_ull(m, ' ', mm ? get_mm_rss(mm) : 0);
521-
seq_put_decimal_ull(m, ' ', rsslim);
522-
seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->start_code : 1) : 0);
523-
seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->end_code : 1) : 0);
524-
seq_put_decimal_ull(m, ' ', (permitted && mm) ? mm->start_stack : 0);
525-
seq_put_decimal_ull(m, ' ', esp);
526-
seq_put_decimal_ull(m, ' ', eip);
488+
seq_put_decimal_ll(m, " ", ppid);
489+
seq_put_decimal_ll(m, " ", pgid);
490+
seq_put_decimal_ll(m, " ", sid);
491+
seq_put_decimal_ll(m, " ", tty_nr);
492+
seq_put_decimal_ll(m, " ", tty_pgrp);
493+
seq_put_decimal_ull(m, " ", task->flags);
494+
seq_put_decimal_ull(m, " ", min_flt);
495+
seq_put_decimal_ull(m, " ", cmin_flt);
496+
seq_put_decimal_ull(m, " ", maj_flt);
497+
seq_put_decimal_ull(m, " ", cmaj_flt);
498+
seq_put_decimal_ull(m, " ", cputime_to_clock_t(utime));
499+
seq_put_decimal_ull(m, " ", cputime_to_clock_t(stime));
500+
seq_put_decimal_ll(m, " ", cputime_to_clock_t(cutime));
501+
seq_put_decimal_ll(m, " ", cputime_to_clock_t(cstime));
502+
seq_put_decimal_ll(m, " ", priority);
503+
seq_put_decimal_ll(m, " ", nice);
504+
seq_put_decimal_ll(m, " ", num_threads);
505+
seq_put_decimal_ull(m, " ", 0);
506+
seq_put_decimal_ull(m, " ", start_time);
507+
seq_put_decimal_ull(m, " ", vsize);
508+
seq_put_decimal_ull(m, " ", mm ? get_mm_rss(mm) : 0);
509+
seq_put_decimal_ull(m, " ", rsslim);
510+
seq_put_decimal_ull(m, " ", mm ? (permitted ? mm->start_code : 1) : 0);
511+
seq_put_decimal_ull(m, " ", mm ? (permitted ? mm->end_code : 1) : 0);
512+
seq_put_decimal_ull(m, " ", (permitted && mm) ? mm->start_stack : 0);
513+
seq_put_decimal_ull(m, " ", esp);
514+
seq_put_decimal_ull(m, " ", eip);
527515
/* The signal information here is obsolete.
528516
* It must be decimal for Linux 2.0 compatibility.
529517
* Use /proc/#/status for real-time signals.
530518
*/
531-
seq_put_decimal_ull(m, ' ', task->pending.signal.sig[0] & 0x7fffffffUL);
532-
seq_put_decimal_ull(m, ' ', task->blocked.sig[0] & 0x7fffffffUL);
533-
seq_put_decimal_ull(m, ' ', sigign.sig[0] & 0x7fffffffUL);
534-
seq_put_decimal_ull(m, ' ', sigcatch.sig[0] & 0x7fffffffUL);
519+
seq_put_decimal_ull(m, " ", task->pending.signal.sig[0] & 0x7fffffffUL);
520+
seq_put_decimal_ull(m, " ", task->blocked.sig[0] & 0x7fffffffUL);
521+
seq_put_decimal_ull(m, " ", sigign.sig[0] & 0x7fffffffUL);
522+
seq_put_decimal_ull(m, " ", sigcatch.sig[0] & 0x7fffffffUL);
535523

536524
/*
537525
* 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,
545533
else
546534
seq_puts(m, " 0");
547535

548-
seq_put_decimal_ull(m, ' ', 0);
549-
seq_put_decimal_ull(m, ' ', 0);
550-
seq_put_decimal_ll(m, ' ', task->exit_signal);
551-
seq_put_decimal_ll(m, ' ', task_cpu(task));
552-
seq_put_decimal_ull(m, ' ', task->rt_priority);
553-
seq_put_decimal_ull(m, ' ', task->policy);
554-
seq_put_decimal_ull(m, ' ', delayacct_blkio_ticks(task));
555-
seq_put_decimal_ull(m, ' ', cputime_to_clock_t(gtime));
556-
seq_put_decimal_ll(m, ' ', cputime_to_clock_t(cgtime));
536+
seq_put_decimal_ull(m, " ", 0);
537+
seq_put_decimal_ull(m, " ", 0);
538+
seq_put_decimal_ll(m, " ", task->exit_signal);
539+
seq_put_decimal_ll(m, " ", task_cpu(task));
540+
seq_put_decimal_ull(m, " ", task->rt_priority);
541+
seq_put_decimal_ull(m, " ", task->policy);
542+
seq_put_decimal_ull(m, " ", delayacct_blkio_ticks(task));
543+
seq_put_decimal_ull(m, " ", cputime_to_clock_t(gtime));
544+
seq_put_decimal_ll(m, " ", cputime_to_clock_t(cgtime));
557545

558546
if (mm && permitted) {
559-
seq_put_decimal_ull(m, ' ', mm->start_data);
560-
seq_put_decimal_ull(m, ' ', mm->end_data);
561-
seq_put_decimal_ull(m, ' ', mm->start_brk);
562-
seq_put_decimal_ull(m, ' ', mm->arg_start);
563-
seq_put_decimal_ull(m, ' ', mm->arg_end);
564-
seq_put_decimal_ull(m, ' ', mm->env_start);
565-
seq_put_decimal_ull(m, ' ', mm->env_end);
547+
seq_put_decimal_ull(m, " ", mm->start_data);
548+
seq_put_decimal_ull(m, " ", mm->end_data);
549+
seq_put_decimal_ull(m, " ", mm->start_brk);
550+
seq_put_decimal_ull(m, " ", mm->arg_start);
551+
seq_put_decimal_ull(m, " ", mm->arg_end);
552+
seq_put_decimal_ull(m, " ", mm->env_start);
553+
seq_put_decimal_ull(m, " ", mm->env_end);
566554
} else
567-
seq_printf(m, " 0 0 0 0 0 0 0");
555+
seq_puts(m, " 0 0 0 0 0 0 0");
568556

569557
if (permitted)
570-
seq_put_decimal_ll(m, ' ', task->exit_code);
558+
seq_put_decimal_ll(m, " ", task->exit_code);
571559
else
572-
seq_put_decimal_ll(m, ' ', 0);
560+
seq_puts(m, " 0");
573561

574562
seq_putc(m, '\n');
575563
if (mm)
@@ -605,13 +593,13 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
605593
* seq_printf(m, "%lu %lu %lu %lu 0 %lu 0\n",
606594
* size, resident, shared, text, data);
607595
*/
608-
seq_put_decimal_ull(m, 0, size);
609-
seq_put_decimal_ull(m, ' ', resident);
610-
seq_put_decimal_ull(m, ' ', shared);
611-
seq_put_decimal_ull(m, ' ', text);
612-
seq_put_decimal_ull(m, ' ', 0);
613-
seq_put_decimal_ull(m, ' ', data);
614-
seq_put_decimal_ull(m, ' ', 0);
596+
seq_put_decimal_ull(m, "", size);
597+
seq_put_decimal_ull(m, " ", resident);
598+
seq_put_decimal_ull(m, " ", shared);
599+
seq_put_decimal_ull(m, " ", text);
600+
seq_put_decimal_ull(m, " ", 0);
601+
seq_put_decimal_ull(m, " ", data);
602+
seq_put_decimal_ull(m, " ", 0);
615603
seq_putc(m, '\n');
616604

617605
return 0;

‎fs/proc/stat.c

+24-25
Original file line numberDiff line numberDiff line change
@@ -115,17 +115,16 @@ static int show_stat(struct seq_file *p, void *v)
115115
}
116116
sum += arch_irq_stat();
117117

118-
seq_puts(p, "cpu ");
119-
seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
120-
seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(nice));
121-
seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(system));
122-
seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(idle));
123-
seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(iowait));
124-
seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(irq));
125-
seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(softirq));
126-
seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(steal));
127-
seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(guest));
128-
seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(guest_nice));
118+
seq_put_decimal_ull(p, "cpu ", cputime64_to_clock_t(user));
119+
seq_put_decimal_ull(p, " ", cputime64_to_clock_t(nice));
120+
seq_put_decimal_ull(p, " ", cputime64_to_clock_t(system));
121+
seq_put_decimal_ull(p, " ", cputime64_to_clock_t(idle));
122+
seq_put_decimal_ull(p, " ", cputime64_to_clock_t(iowait));
123+
seq_put_decimal_ull(p, " ", cputime64_to_clock_t(irq));
124+
seq_put_decimal_ull(p, " ", cputime64_to_clock_t(softirq));
125+
seq_put_decimal_ull(p, " ", cputime64_to_clock_t(steal));
126+
seq_put_decimal_ull(p, " ", cputime64_to_clock_t(guest));
127+
seq_put_decimal_ull(p, " ", cputime64_to_clock_t(guest_nice));
129128
seq_putc(p, '\n');
130129

131130
for_each_online_cpu(i) {
@@ -141,23 +140,23 @@ static int show_stat(struct seq_file *p, void *v)
141140
guest = kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
142141
guest_nice = kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
143142
seq_printf(p, "cpu%d", i);
144-
seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
145-
seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(nice));
146-
seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(system));
147-
seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(idle));
148-
seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(iowait));
149-
seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(irq));
150-
seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(softirq));
151-
seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(steal));
152-
seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(guest));
153-
seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(guest_nice));
143+
seq_put_decimal_ull(p, " ", cputime64_to_clock_t(user));
144+
seq_put_decimal_ull(p, " ", cputime64_to_clock_t(nice));
145+
seq_put_decimal_ull(p, " ", cputime64_to_clock_t(system));
146+
seq_put_decimal_ull(p, " ", cputime64_to_clock_t(idle));
147+
seq_put_decimal_ull(p, " ", cputime64_to_clock_t(iowait));
148+
seq_put_decimal_ull(p, " ", cputime64_to_clock_t(irq));
149+
seq_put_decimal_ull(p, " ", cputime64_to_clock_t(softirq));
150+
seq_put_decimal_ull(p, " ", cputime64_to_clock_t(steal));
151+
seq_put_decimal_ull(p, " ", cputime64_to_clock_t(guest));
152+
seq_put_decimal_ull(p, " ", cputime64_to_clock_t(guest_nice));
154153
seq_putc(p, '\n');
155154
}
156-
seq_printf(p, "intr %llu", (unsigned long long)sum);
155+
seq_put_decimal_ull(p, "intr ", (unsigned long long)sum);
157156

158157
/* sum again ? it could be updated? */
159158
for_each_irq_nr(j)
160-
seq_put_decimal_ull(p, ' ', kstat_irqs_usr(j));
159+
seq_put_decimal_ull(p, " ", kstat_irqs_usr(j));
161160

162161
seq_printf(p,
163162
"\nctxt %llu\n"
@@ -171,10 +170,10 @@ static int show_stat(struct seq_file *p, void *v)
171170
nr_running(),
172171
nr_iowait());
173172

174-
seq_printf(p, "softirq %llu", (unsigned long long)sum_softirq);
173+
seq_put_decimal_ull(p, "softirq ", (unsigned long long)sum_softirq);
175174

176175
for (i = 0; i < NR_SOFTIRQS; i++)
177-
seq_put_decimal_ull(p, ' ', per_softirq_sums[i]);
176+
seq_put_decimal_ull(p, " ", per_softirq_sums[i]);
178177
seq_putc(p, '\n');
179178

180179
return 0;

0 commit comments

Comments
 (0)