diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2008-10-04 15:53:21 -0400 |
---|---|---|
committer | Alexey Dobriyan <adobriyan@gmail.com> | 2008-10-23 07:07:31 -0400 |
commit | f500975a3f3ecf3611d79f1d933906753460b9f2 (patch) | |
tree | df3728998ca1638ecbccf4ab6f401f9a2cbdba88 /block/genhd.c | |
parent | 8591cf43224980a0bc9216a4e50b0a740f8cba35 (diff) |
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/genhd.c')
-rw-r--r-- | block/genhd.c | 22 |
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 @@ | |||
10 | #include <linux/blkdev.h> | 10 | #include <linux/blkdev.h> |
11 | #include <linux/init.h> | 11 | #include <linux/init.h> |
12 | #include <linux/spinlock.h> | 12 | #include <linux/spinlock.h> |
13 | #include <linux/proc_fs.h> | ||
13 | #include <linux/seq_file.h> | 14 | #include <linux/seq_file.h> |
14 | #include <linux/slab.h> | 15 | #include <linux/slab.h> |
15 | #include <linux/kmod.h> | 16 | #include <linux/kmod.h> |
@@ -727,12 +728,24 @@ static int show_partition(struct seq_file *seqf, void *v) | |||
727 | return 0; | 728 | return 0; |
728 | } | 729 | } |
729 | 730 | ||
730 | const struct seq_operations partitions_op = { | 731 | static const struct seq_operations partitions_op = { |
731 | .start = show_partition_start, | 732 | .start = show_partition_start, |
732 | .next = disk_seqf_next, | 733 | .next = disk_seqf_next, |
733 | .stop = disk_seqf_stop, | 734 | .stop = disk_seqf_stop, |
734 | .show = show_partition | 735 | .show = show_partition |
735 | }; | 736 | }; |
737 | |||
738 | static int partitions_open(struct inode *inode, struct file *file) | ||
739 | { | ||
740 | return seq_open(file, &partitions_op); | ||
741 | } | ||
742 | |||
743 | static const struct file_operations proc_partitions_operations = { | ||
744 | .open = partitions_open, | ||
745 | .read = seq_read, | ||
746 | .llseek = seq_lseek, | ||
747 | .release = seq_release, | ||
748 | }; | ||
736 | #endif | 749 | #endif |
737 | 750 | ||
738 | 751 | ||
@@ -998,6 +1011,13 @@ const struct seq_operations diskstats_op = { | |||
998 | .stop = disk_seqf_stop, | 1011 | .stop = disk_seqf_stop, |
999 | .show = diskstats_show | 1012 | .show = diskstats_show |
1000 | }; | 1013 | }; |
1014 | |||
1015 | static int __init proc_genhd_init(void) | ||
1016 | { | ||
1017 | proc_create("partitions", 0, NULL, &proc_partitions_operations); | ||
1018 | return 0; | ||
1019 | } | ||
1020 | module_init(proc_genhd_init); | ||
1001 | #endif /* CONFIG_PROC_FS */ | 1021 | #endif /* CONFIG_PROC_FS */ |
1002 | 1022 | ||
1003 | static void media_change_notify_thread(struct work_struct *work) | 1023 | static void media_change_notify_thread(struct work_struct *work) |