Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-01 10:43:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

proc: move rest of /proc/partitions code to block/genhd.c

Browse Source 
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Acked-by: Jens Axboe <jens.axboe@oracle.com>
This commit is contained in:
Alexey Dobriyan 2008-10-04 23:53:21 +04:00
parent 8591cf4322
commit f500975a3f
3 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
block/genhd.c
View File

@ -10,6 +10,7 @@
#include <linux/blkdev.h> #include <linux/blkdev.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/kmod.h> #include <linux/kmod.h>
@ -727,12 +728,24 @@ static int show_partition(struct seq_file *seqf, void *v)
return 0; return 0;
} }
const struct seq_operations partitions_op = { static const struct seq_operations partitions_op = {
.start = show_partition_start, .start = show_partition_start,
.next = disk_seqf_next, .next = disk_seqf_next,
.stop = disk_seqf_stop, .stop = disk_seqf_stop,
.show = show_partition .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 #endif
@ -998,6 +1011,13 @@ const struct seq_operations diskstats_op = {
.stop = disk_seqf_stop, .stop = disk_seqf_stop,
.show = diskstats_show .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 */ #endif /* CONFIG_PROC_FS */
static void media_change_notify_thread(struct work_struct *work) static void media_change_notify_thread(struct work_struct *work)

14
fs/proc/proc_misc.c
View File

@ -106,17 +106,6 @@ static const struct file_operations proc_vmstat_file_operations = {
}; };
#ifdef CONFIG_BLOCK #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) static int diskstats_open(struct inode *inode, struct file *file)
{ {
return seq_open(file, &diskstats_op); return seq_open(file, &diskstats_op);
@ -519,9 +508,6 @@ void __init proc_misc_init(void)
proc_symlink("mounts", NULL, "self/mounts"); proc_symlink("mounts", NULL, "self/mounts");
/* And now for trickier ones */ /* 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("stat", 0, NULL, &proc_stat_operations);
proc_create("interrupts", 0, NULL, &proc_interrupts_operations); proc_create("interrupts", 0, NULL, &proc_interrupts_operations);
#ifdef CONFIG_SLABINFO #ifdef CONFIG_SLABINFO

1
include/linux/genhd.h
View File

@ -25,7 +25,6 @@ extern struct device_type part_type;
extern struct kobject *block_depr; extern struct kobject *block_depr;
extern struct class block_class; extern struct class block_class;
extern const struct seq_operations partitions_op;
extern const struct seq_operations diskstats_op; extern const struct seq_operations diskstats_op;
enum { enum {