leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Acked-by: Christoph Lameter <cl@linux-foundation.org>
This commit is contained in:
Alexey Dobriyan 2008-10-06 04:19:42 +04:00
parent b6aa44ab69
commit 5c9fe6281b
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fs/proc/proc_misc.c
View File

@ -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

1
include/linux/vmstat.h
View File

@ -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

15
mm/vmstat.c
View File

@ -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;
}