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

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

proc: move /proc/slab_allocators boilerplate to mm/slab.c 



Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Acked-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
parent d6917e19

fs/proc/proc_misc.c

+0 −30
Original line number Diff line number Diff line
@@ -144,33 +144,6 @@ static const struct file_operations proc_slabinfo_operations = { 
	.llseek		= seq_lseek,

	.release	= seq_release,

};



#ifdef CONFIG_DEBUG_SLAB_LEAK

extern const struct seq_operations slabstats_op;

static int slabstats_open(struct inode *inode, struct file *file)

{

	unsigned long *n = kzalloc(PAGE_SIZE, GFP_KERNEL);

	int ret = -ENOMEM;

	if (n) {

		ret = seq_open(file, &slabstats_op);

		if (!ret) {

			struct seq_file *m = file->private_data;

			*n = PAGE_SIZE / (2 * sizeof(unsigned long));

			m->private = n;

			n = NULL;

		}

		kfree(n);

	}

	return ret;

}



static const struct file_operations proc_slabstats_operations = {

	.open		= slabstats_open,

	.read		= seq_read,

	.llseek		= seq_lseek,

	.release	= seq_release_private,

};

#endif

#endif



#ifdef CONFIG_MMU
@@ -338,9 +311,6 @@ void __init proc_misc_init(void) 
	/* And now for trickier ones */

#ifdef CONFIG_SLABINFO

	proc_create("slabinfo",S_IWUSR|S_IRUGO,NULL,&proc_slabinfo_operations);

#ifdef CONFIG_DEBUG_SLAB_LEAK

	proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations);

#endif

#endif

#ifdef CONFIG_MMU

	proc_create("vmallocinfo", S_IRUSR, NULL, &proc_vmalloc_operations);

mm/slab.c

+35 −1
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ 
#include	<linux/init.h>

#include	<linux/compiler.h>

#include	<linux/cpuset.h>

#include	<linux/proc_fs.h>

#include	<linux/seq_file.h>

#include	<linux/notifier.h>

#include	<linux/kallsyms.h>
@@ -4443,13 +4444,46 @@ static int leaks_show(struct seq_file *m, void *p) 
	return 0;

}



const struct seq_operations slabstats_op = {

static const struct seq_operations slabstats_op = {

	.start = leaks_start,

	.next = s_next,

	.stop = s_stop,

	.show = leaks_show,

};



static int slabstats_open(struct inode *inode, struct file *file)

{

	unsigned long *n = kzalloc(PAGE_SIZE, GFP_KERNEL);

	int ret = -ENOMEM;

	if (n) {

		ret = seq_open(file, &slabstats_op);

		if (!ret) {

			struct seq_file *m = file->private_data;

			*n = PAGE_SIZE / (2 * sizeof(unsigned long));

			m->private = n;

			n = NULL;

		}

		kfree(n);

	}

	return ret;

}



static const struct file_operations proc_slabstats_operations = {

	.open		= slabstats_open,

	.read		= seq_read,

	.llseek		= seq_lseek,

	.release	= seq_release_private,

};

#endif



static int __init slab_proc_init(void)

{

#ifdef CONFIG_DEBUG_SLAB_LEAK

	proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations);

#endif

	return 0;

}

module_init(slab_proc_init);

#endif



/**