diff options
Diffstat (limited to 'block')
-rw-r--r-- | block/genhd.c | 37 |
1 files changed, 35 insertions, 2 deletions
diff --git a/block/genhd.c b/block/genhd.c index 646e1d2507c7..4e5e7493f676 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 | ||
@@ -992,12 +1005,32 @@ static int diskstats_show(struct seq_file *seqf, void *v) | |||
992 | return 0; | 1005 | return 0; |
993 | } | 1006 | } |
994 | 1007 | ||
995 | const struct seq_operations diskstats_op = { | 1008 | static const struct seq_operations diskstats_op = { |
996 | .start = disk_seqf_start, | 1009 | .start = disk_seqf_start, |
997 | .next = disk_seqf_next, | 1010 | .next = disk_seqf_next, |
998 | .stop = disk_seqf_stop, | 1011 | .stop = disk_seqf_stop, |
999 | .show = diskstats_show | 1012 | .show = diskstats_show |
1000 | }; | 1013 | }; |
1014 | |||
1015 | static int diskstats_open(struct inode *inode, struct file *file) | ||
1016 | { | ||
1017 | return seq_open(file, &diskstats_op); | ||
1018 | } | ||
1019 | |||
1020 | static const struct file_operations proc_diskstats_operations = { | ||
1021 | .open = diskstats_open, | ||
1022 | .read = seq_read, | ||
1023 | .llseek = seq_lseek, | ||
1024 | .release = seq_release, | ||
1025 | }; | ||
1026 | |||
1027 | static int __init proc_genhd_init(void) | ||
1028 | { | ||
1029 | proc_create("diskstats", 0, NULL, &proc_diskstats_operations); | ||
1030 | proc_create("partitions", 0, NULL, &proc_partitions_operations); | ||
1031 | return 0; | ||
1032 | } | ||
1033 | module_init(proc_genhd_init); | ||
1001 | #endif /* CONFIG_PROC_FS */ | 1034 | #endif /* CONFIG_PROC_FS */ |
1002 | 1035 | ||
1003 | static void media_change_notify_thread(struct work_struct *work) | 1036 | static void media_change_notify_thread(struct work_struct *work) |