proc: move rest of /proc/partitions code to block/genhd.c

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Acked-by: Jens Axboe <jens.axboe@oracle.com>

3 files changed, 21 insertions, 16 deletions

diff --git a/block/genhd.c b/block/genhd.c
index 646e1d2507c7..15f4d2b12c48 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -10,6 +10,7 @@
 #include <linux/blkdev.h>
 #include <linux/init.h>
 #include <linux/spinlock.h>
+#include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/slab.h>
 #include <linux/kmod.h>
@@ -727,12 +728,24 @@ static int show_partition(struct seq_file *seqf, void *v)
         return 0;
 }
 
-const struct seq_operations partitions_op = {
+static const struct seq_operations partitions_op = {
         .start  = show_partition_start,
         .next   = disk_seqf_next,
         .stop   = disk_seqf_stop,
         .show   = show_partition
 };
+
+static int partitions_open(struct inode *inode, struct file *file)
+{
+        return seq_open(file, &partitions_op);
+}
+
+static const struct file_operations proc_partitions_operations = {
+        .open           = partitions_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = seq_release,
+};
 #endif
 
 
@@ -998,6 +1011,13 @@ const struct seq_operations diskstats_op = {
         .stop   = disk_seqf_stop,
         .show   = diskstats_show
 };
+
+static int __init proc_genhd_init(void)
+{
+        proc_create("partitions", 0, NULL, &proc_partitions_operations);
+        return 0;
+}
+module_init(proc_genhd_init);
 #endif /* CONFIG_PROC_FS */
 
 static void media_change_notify_thread(struct work_struct *work)
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c
index 8974809be5f6..253ea50c4393 100644
--- a/fs/proc/proc_misc.c
+++ b/fs/proc/proc_misc.c
@@ -106,17 +106,6 @@ static const struct file_operations proc_vmstat_file_operations = {
 };
 
 #ifdef CONFIG_BLOCK
-static int partitions_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &partitions_op);
-}
-static const struct file_operations proc_partitions_operations = {
-        .open           = partitions_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
 static int diskstats_open(struct inode *inode, struct file *file)
 {
         return seq_open(file, &diskstats_op);
@@ -519,9 +508,6 @@ void __init proc_misc_init(void)
         proc_symlink("mounts", NULL, "self/mounts");
 
         /* And now for trickier ones */
-#ifdef CONFIG_BLOCK
-        proc_create("partitions", 0, NULL, &proc_partitions_operations);
-#endif
         proc_create("stat", 0, NULL, &proc_stat_operations);
         proc_create("interrupts", 0, NULL, &proc_interrupts_operations);
 #ifdef CONFIG_SLABINFO
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index 206cdf96c3a7..074a4fdf4365 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -25,7 +25,6 @@ extern struct device_type part_type;
 extern struct kobject *block_depr;
 extern struct class block_class;
 
-extern const struct seq_operations partitions_op;
 extern const struct seq_operations diskstats_op;
 
 enum {