proc: move /proc/devices code to fs/proc/devices.c (fe251042) · Commits · e / devices / android_kernel_xiaomi_markw

fs/proc/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@ proc-$(CONFIG_MMU) := mmu.o task_mmu.o
		proc-y += inode.o root.o base.o generic.o array.o \
		proc_tty.o proc_misc.o
		proc-y += cmdline.o
		proc-y += devices.o
		proc-y += loadavg.o
		proc-y += meminfo.o
		proc-y += uptime.o

fs/proc/devices.c

0 → 100644

+70 −0

Original line number	Diff line number	Diff line
		#include <linux/fs.h>
		#include <linux/init.h>
		#include <linux/proc_fs.h>
		#include <linux/seq_file.h>

		static int devinfo_show(struct seq_file f, void v)
		{
		int i = (loff_t ) v;

		if (i < CHRDEV_MAJOR_HASH_SIZE) {
		if (i == 0)
		seq_printf(f, "Character devices:\n");
		chrdev_show(f, i);
		}
		#ifdef CONFIG_BLOCK
		else {
		i -= CHRDEV_MAJOR_HASH_SIZE;
		if (i == 0)
		seq_printf(f, "\nBlock devices:\n");
		blkdev_show(f, i);
		}
		#endif
		return 0;
		}

		static void devinfo_start(struct seq_file f, loff_t *pos)
		{
		if (*pos < (BLKDEV_MAJOR_HASH_SIZE + CHRDEV_MAJOR_HASH_SIZE))
		return pos;
		return NULL;
		}

		static void devinfo_next(struct seq_file f, void v, loff_t pos)
		{
		(*pos)++;
		if (*pos >= (BLKDEV_MAJOR_HASH_SIZE + CHRDEV_MAJOR_HASH_SIZE))
		return NULL;
		return pos;
		}

		static void devinfo_stop(struct seq_file f, void v)
		{
		/* Nothing to do */
		}

		static const struct seq_operations devinfo_ops = {
		.start = devinfo_start,
		.next = devinfo_next,
		.stop = devinfo_stop,
		.show = devinfo_show
		};

		static int devinfo_open(struct inode inode, struct file filp)
		{
		return seq_open(filp, &devinfo_ops);
		}

		static const struct file_operations proc_devinfo_operations = {
		.open = devinfo_open,
		.read = seq_read,
		.llseek = seq_lseek,
		.release = seq_release,
		};

		static int __init proc_devices_init(void)
		{
		proc_create("devices", 0, NULL, &proc_devinfo_operations);
		return 0;
		}
		module_init(proc_devices_init);

fs/proc/proc_misc.c

+0 −60

Original line number	Diff line number	Diff line
		@@ -107,65 +107,6 @@ static const struct file_operations proc_cpuinfo_operations = {
		.release = seq_release,
		};

		static int devinfo_show(struct seq_file f, void v)
		{
		int i = (loff_t ) v;

		if (i < CHRDEV_MAJOR_HASH_SIZE) {
		if (i == 0)
		seq_printf(f, "Character devices:\n");
		chrdev_show(f, i);
		}
		#ifdef CONFIG_BLOCK
		else {
		i -= CHRDEV_MAJOR_HASH_SIZE;
		if (i == 0)
		seq_printf(f, "\nBlock devices:\n");
		blkdev_show(f, i);
		}
		#endif
		return 0;
		}

		static void devinfo_start(struct seq_file f, loff_t *pos)
		{
		if (*pos < (BLKDEV_MAJOR_HASH_SIZE + CHRDEV_MAJOR_HASH_SIZE))
		return pos;
		return NULL;
		}

		static void devinfo_next(struct seq_file f, void v, loff_t pos)
		{
		(*pos)++;
		if (*pos >= (BLKDEV_MAJOR_HASH_SIZE + CHRDEV_MAJOR_HASH_SIZE))
		return NULL;
		return pos;
		}

		static void devinfo_stop(struct seq_file f, void v)
		{
		/* Nothing to do */
		}

		static const struct seq_operations devinfo_ops = {
		.start = devinfo_start,
		.next = devinfo_next,
		.stop = devinfo_stop,
		.show = devinfo_show
		};

		static int devinfo_open(struct inode inode, struct file filp)
		{
		return seq_open(filp, &devinfo_ops);
		}

		static const struct file_operations proc_devinfo_operations = {
		.open = devinfo_open,
		.read = seq_read,
		.llseek = seq_lseek,
		.release = seq_release,
		};

		static int vmstat_open(struct inode inode, struct file file)
		{
		return seq_open(file, &vmstat_op);
		@@ -591,7 +532,6 @@ void __init proc_misc_init(void)
		proc_symlink("mounts", NULL, "self/mounts");

		/* And now for trickier ones */
		proc_create("devices", 0, NULL, &proc_devinfo_operations);
		proc_create("cpuinfo", 0, NULL, &proc_cpuinfo_operations);
		#ifdef CONFIG_BLOCK
		proc_create("partitions", 0, NULL, &proc_partitions_operations);