summaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2008-10-04 23:53:21 +0400
committerAlexey Dobriyan <adobriyan@gmail.com>2008-10-23 15:07:31 +0400
commitf500975a3f3ecf3611d79f1d933906753460b9f2 (patch)
treedf3728998ca1638ecbccf4ab6f401f9a2cbdba88 /block
parent8591cf43224980a0bc9216a4e50b0a740f8cba35 (diff)
downloadlinux-f500975a3f3ecf3611d79f1d933906753460b9f2.tar.xz
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>
Diffstat (limited to 'block')
-rw-r--r--block/genhd.c22
1 files changed, 21 insertions, 1 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)