Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f500975a authored by Alexey Dobriyan's avatar Alexey Dobriyan
Browse files

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



Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Acked-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 8591cf43

block/genhd.c

+21 −1
Original line number Diff line number Diff line
@@ -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)

fs/proc/proc_misc.c

+0 −14
Original line number Diff line number Diff line
@@ -106,17 +106,6 @@ static const struct file_operations proc_vmstat_file_operations = { 
};



#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)

{

	return seq_open(file, &diskstats_op);
@@ -519,9 +508,6 @@ void __init proc_misc_init(void) 
	proc_symlink("mounts", NULL, "self/mounts");



	/* 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("interrupts", 0, NULL, &proc_interrupts_operations);

#ifdef CONFIG_SLABINFO

include/linux/genhd.h

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ extern struct device_type part_type; 
extern struct kobject *block_depr;

extern struct class block_class;



extern const struct seq_operations partitions_op;

extern const struct seq_operations diskstats_op;



enum {