Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a56d3fc7 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Linus Torvalds
Browse files

seqfile convert proc_pid_statm 



This conversion is just for code cleanliness, uniformity, and general safety.

Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
Cc: Oleg Nesterov <oleg@tv-sign.ru>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ee992744

fs/proc/array.c

+5 −3
Original line number Diff line number Diff line
@@ -563,7 +563,8 @@ int proc_tgid_stat(struct seq_file *m, struct pid_namespace *ns, 
	return do_task_stat(m, ns, pid, task, 1);

}



int proc_pid_statm(struct task_struct *task, char *buffer)

int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,

			struct pid *pid, struct task_struct *task)

{

	int size = 0, resident = 0, shared = 0, text = 0, lib = 0, data = 0;

	struct mm_struct *mm = get_task_mm(task);
@@ -572,7 +573,8 @@ int proc_pid_statm(struct task_struct *task, char *buffer) 
		size = task_statm(mm, &shared, &text, &data, &resident);

		mmput(mm);

	}



	return sprintf(buffer, "%d %d %d %d %d %d %d\n",

	seq_printf(m, "%d %d %d %d %d %d %d\n",

			size, resident, shared, text, lib, data, 0);



	return 0;

}

fs/proc/base.c

+2 −2
Original line number Diff line number Diff line
@@ -2281,7 +2281,7 @@ static const struct pid_entry tgid_base_stuff[] = { 
#endif

	INF("cmdline",    S_IRUGO, pid_cmdline),

	ONE("stat",       S_IRUGO, tgid_stat),

	INF("statm",      S_IRUGO, pid_statm),

	ONE("statm",      S_IRUGO, pid_statm),

	REG("maps",       S_IRUGO, maps),

#ifdef CONFIG_NUMA

	REG("numa_maps",  S_IRUGO, numa_maps),
@@ -2612,7 +2612,7 @@ static const struct pid_entry tid_base_stuff[] = { 
#endif

	INF("cmdline",   S_IRUGO, pid_cmdline),

	ONE("stat",      S_IRUGO, tid_stat),

	INF("statm",     S_IRUGO, pid_statm),

	ONE("statm",     S_IRUGO, pid_statm),

	REG("maps",      S_IRUGO, maps),

#ifdef CONFIG_NUMA

	REG("numa_maps", S_IRUGO, numa_maps),

fs/proc/internal.h

+2 −1
Original line number Diff line number Diff line
@@ -54,7 +54,8 @@ extern int proc_tid_stat(struct seq_file *m, struct pid_namespace *ns, 
extern int proc_tgid_stat(struct seq_file *m, struct pid_namespace *ns,

				struct pid *pid, struct task_struct *task);

extern int proc_pid_status(struct task_struct *, char *);

extern int proc_pid_statm(struct task_struct *, char *);

extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,

				struct pid *pid, struct task_struct *task);

extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);



extern const struct file_operations proc_maps_operations;