[PATCH 15/31] proc: move rest of /proc/partitions code to block/genhd.c

[PATCH 15/31] proc: move rest of /proc/partitions code to block/genhd.c

[Alexey Dobriyan]

>From de5824cba6d479dc525cb24810582e3606e3d166 Mon Sep 17 00:00:00 2001
From: Alexey Dobriyan <adobriyan@gmail.com>
Date: Sat, 4 Oct 2008 23:53:21 +0400
Subject: [PATCH 15/31] proc: move rest of /proc/partitions code to block/genhd.c

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
---
 block/genhd.c         |   22 +++++++++++++++++++++-
 fs/proc/proc_misc.c   |   14 --------------
 include/linux/genhd.h |    1 -
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/block/genhd.c b/block/genhd.c
index 4cd3433..7a7f823 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>
@@ -728,12 +729,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
 
 
@@ -999,6 +1012,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 916ed4d..24c4f8d 100644
--- a/fs/proc/proc_misc.c
+++ b/fs/proc/proc_misc.c
@@ -105,17 +105,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);
@@ -521,9 +510,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 206cdf9..074a4fd 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 {
-- 
1.5.6.5

Re: [PATCH 15/31] proc: move rest of /proc/partitions code to block/genhd.c

[Jens Axboe]

On Fri, Oct 17 2008, Alexey Dobriyan wrote:
> 
> From de5824cba6d479dc525cb24810582e3606e3d166 Mon Sep 17 00:00:00 2001
> From: Alexey Dobriyan <adobriyan@gmail.com>
> Date: Sat, 4 Oct 2008 23:53:21 +0400
> Subject: [PATCH 15/31] proc: move rest of /proc/partitions code to block/genhd.c
> 
> Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>

This and 25/31 look fine to me. How do you plan on merging this? I could
take the two through the block tree, but seems easier just to merge the
entire series through eg Andrew.

Anyway, you can add my Acked-by: to them.

-- 
Jens Axboe

Re: [PATCH 15/31] proc: move rest of /proc/partitions code to block/genhd.c

[Alexey Dobriyan]

On Fri, Oct 17, 2008 at 03:40:37PM +0200, Jens Axboe wrote:
> On Fri, Oct 17 2008, Alexey Dobriyan wrote:
> > 
> > From de5824cba6d479dc525cb24810582e3606e3d166 Mon Sep 17 00:00:00 2001
> > From: Alexey Dobriyan <adobriyan@gmail.com>
> > Date: Sat, 4 Oct 2008 23:53:21 +0400
> > Subject: [PATCH 15/31] proc: move rest of /proc/partitions code to block/genhd.c
> > 
> > Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
> 
> This and 25/31 look fine to me. How do you plan on merging this?

I think to do it via proc.git.

Looking at -next, nobody will notice, looking at -mm, Rik will notice
because of silly meminfo format string reformat. The rest of meminfo
rejects will be trivially fixed via filename changes.

> I could take the two through the block tree, but seems easier just to merge
> the entire series through eg Andrew.