diff options
| author | Alexey Dobriyan <adobriyan@gmail.com> | 2008-10-06 12:55:38 +0400 |
|---|---|---|
| committer | Alexey Dobriyan <adobriyan@gmail.com> | 2008-10-23 17:57:37 +0400 |
| commit | 31d85ab28e71b0c938e0ef48af45747e80d99b53 (patch) | |
| tree | 1cd97bee97abb008dd3591da2a001e3e85356fb6 | |
| parent | 5c9fe6281b75832e8d2555ec8700ea763d9a865e (diff) | |
| download | lwn-31d85ab28e71b0c938e0ef48af45747e80d99b53.tar.gz lwn-31d85ab28e71b0c938e0ef48af45747e80d99b53.zip | |
proc: move /proc/diskstats boilerplate to block/genhd.c
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Acked-by: Jens Axboe <jens.axboe@oracle.com>
| -rw-r--r-- | block/genhd.c | 15 | ||||
| -rw-r--r-- | fs/proc/proc_misc.c | 16 | ||||
| -rw-r--r-- | include/linux/genhd.h | 2 |
3 files changed, 14 insertions, 19 deletions
diff --git a/block/genhd.c b/block/genhd.c index 15f4d2b12c48..4e5e7493f676 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -1005,15 +1005,28 @@ static int diskstats_show(struct seq_file *seqf, void *v) return 0; } -const struct seq_operations diskstats_op = { +static const struct seq_operations diskstats_op = { .start = disk_seqf_start, .next = disk_seqf_next, .stop = disk_seqf_stop, .show = diskstats_show }; +static int diskstats_open(struct inode *inode, struct file *file) +{ + return seq_open(file, &diskstats_op); +} + +static const struct file_operations proc_diskstats_operations = { + .open = diskstats_open, + .read = seq_read, + .llseek = seq_lseek, + .release = seq_release, +}; + static int __init proc_genhd_init(void) { + proc_create("diskstats", 0, NULL, &proc_diskstats_operations); proc_create("partitions", 0, NULL, &proc_partitions_operations); return 0; } diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c index 8f3a6f085c5f..7c22831efd94 100644 --- a/fs/proc/proc_misc.c +++ b/fs/proc/proc_misc.c @@ -57,19 +57,6 @@ #include <asm/div64.h> #include "internal.h" -#ifdef CONFIG_BLOCK -static int diskstats_open(struct inode *inode, struct file *file) -{ - return seq_open(file, &diskstats_op); -} -static const struct file_operations proc_diskstats_operations = { - .open = diskstats_open, - .read = seq_read, - .llseek = seq_lseek, - .release = seq_release, -}; -#endif - #ifdef CONFIG_MODULES extern const struct seq_operations modules_op; static int modules_open(struct inode *inode, struct file *file) @@ -222,9 +209,6 @@ void __init proc_misc_init(void) proc_symlink("mounts", NULL, "self/mounts"); /* And now for trickier ones */ -#ifdef CONFIG_BLOCK - proc_create("diskstats", 0, NULL, &proc_diskstats_operations); -#endif #ifdef CONFIG_MODULES proc_create("modules", 0, NULL, &proc_modules_operations); #endif diff --git a/include/linux/genhd.h b/include/linux/genhd.h index 074a4fdf4365..e439e6aed832 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h @@ -25,8 +25,6 @@ extern struct device_type part_type; extern struct kobject *block_depr; extern struct class block_class; -extern const struct seq_operations diskstats_op; - enum { /* These three have identical behaviour; use the second one if DOS FDISK gets confused about extended/logical partitions starting past cylinder 1023. */ |