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

Commit 5c9fe628 authored by Alexey Dobriyan's avatar Alexey Dobriyan
Browse files

proc: move /proc/zoneinfo boilerplate to mm/vmstat.c 



Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Acked-by: default avatarChristoph Lameter <cl@linux-foundation.org>
parent b6aa44ab

fs/proc/proc_misc.c

+0 −13
Original line number Diff line number Diff line
@@ -57,18 +57,6 @@ 
#include <asm/div64.h>

#include "internal.h"



static int zoneinfo_open(struct inode *inode, struct file *file)

{

	return seq_open(file, &zoneinfo_op);

}



static const struct file_operations proc_zoneinfo_file_operations = {

	.open		= zoneinfo_open,

	.read		= seq_read,

	.llseek		= seq_lseek,

	.release	= seq_release,

};



#ifdef CONFIG_BLOCK

static int diskstats_open(struct inode *inode, struct file *file)

{
@@ -234,7 +222,6 @@ void __init proc_misc_init(void) 
	proc_symlink("mounts", NULL, "self/mounts");



	/* And now for trickier ones */

	proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);

#ifdef CONFIG_BLOCK

	proc_create("diskstats", 0, NULL, &proc_diskstats_operations);

#endif

include/linux/vmstat.h

+0 −1
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT, 
		NR_VM_EVENT_ITEMS

};



extern const struct seq_operations zoneinfo_op;

extern int sysctl_stat_interval;



#ifdef CONFIG_VM_EVENT_COUNTERS

mm/vmstat.c

+14 −1
Original line number Diff line number Diff line
@@ -795,7 +795,7 @@ static int zoneinfo_show(struct seq_file *m, void *arg) 
	return 0;

}



const struct seq_operations zoneinfo_op = {

static const struct seq_operations zoneinfo_op = {

	.start	= frag_start, /* iterate over all zones. The same as in

			       * fragmentation. */

	.next	= frag_next,
@@ -803,6 +803,18 @@ const struct seq_operations zoneinfo_op = { 
	.show	= zoneinfo_show,

};



static int zoneinfo_open(struct inode *inode, struct file *file)

{

	return seq_open(file, &zoneinfo_op);

}



static const struct file_operations proc_zoneinfo_file_operations = {

	.open		= zoneinfo_open,

	.read		= seq_read,

	.llseek		= seq_lseek,

	.release	= seq_release,

};



static void *vmstat_start(struct seq_file *m, loff_t *pos)

{

	unsigned long *v;
@@ -950,6 +962,7 @@ static int __init setup_vmstat(void) 
	proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);

	proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);

	proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);

	proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);

#endif

	return 0;

}