proc: move /proc/zoneinfo boilerplate to mm/vmstat.c
authorAlexey Dobriyan <adobriyan@gmail.com>
Mon, 6 Oct 2008 00:19:42 +0000 (04:19 +0400)
committerAlexey Dobriyan <adobriyan@gmail.com>
Thu, 23 Oct 2008 13:35:04 +0000 (17:35 +0400)
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Acked-by: Christoph Lameter <cl@linux-foundation.org>
fs/proc/proc_misc.c
include/linux/vmstat.h
mm/vmstat.c

index e7a301d5d4323deb48a4ac24b678af6c6e73ab78..8f3a6f085c5f0ffda0d1c4b220292d8ec757d2d0 100644 (file)
 #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
index 7b68c4c1e19c4ebc2c140a6a0c3ef415657d1a31..524cd1b28ecb0ff62a9d3620f9d21d48f8c1e32e 100644 (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
index 7e1854b81868cbf6f7f88e43a99abe4ed8f39986..c3ccfda23adc56abafb58abbcc31b33c5588ce4d 100644 (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;
 }