proc: move /proc/slabinfo boilerplate to mm/slub.c, mm/slab.c
Lose dummy ->write hook in case of SLUB, it's possible now. Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Acked-by: Pekka Enberg <penberg@cs.helsinki.fi>wifi-calibration
parent
a0ec95a8e6
commit
7b3c3a50a3
|
@ -132,20 +132,6 @@ static const struct file_operations proc_modules_operations = {
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_SLABINFO
|
|
||||||
static int slabinfo_open(struct inode *inode, struct file *file)
|
|
||||||
{
|
|
||||||
return seq_open(file, &slabinfo_op);
|
|
||||||
}
|
|
||||||
static const struct file_operations proc_slabinfo_operations = {
|
|
||||||
.open = slabinfo_open,
|
|
||||||
.read = seq_read,
|
|
||||||
.write = slabinfo_write,
|
|
||||||
.llseek = seq_lseek,
|
|
||||||
.release = seq_release,
|
|
||||||
};
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef CONFIG_MMU
|
#ifdef CONFIG_MMU
|
||||||
static int vmalloc_open(struct inode *inode, struct file *file)
|
static int vmalloc_open(struct inode *inode, struct file *file)
|
||||||
{
|
{
|
||||||
|
@ -309,9 +295,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_SLABINFO
|
|
||||||
proc_create("slabinfo",S_IWUSR|S_IRUGO,NULL,&proc_slabinfo_operations);
|
|
||||||
#endif
|
|
||||||
#ifdef CONFIG_MMU
|
#ifdef CONFIG_MMU
|
||||||
proc_create("vmallocinfo", S_IRUSR, NULL, &proc_vmalloc_operations);
|
proc_create("vmallocinfo", S_IRUSR, NULL, &proc_vmalloc_operations);
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -288,9 +288,4 @@ static inline void *kzalloc_node(size_t size, gfp_t flags, int node)
|
||||||
return kmalloc_node(size, flags | __GFP_ZERO, node);
|
return kmalloc_node(size, flags | __GFP_ZERO, node);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_SLABINFO
|
|
||||||
extern const struct seq_operations slabinfo_op;
|
|
||||||
ssize_t slabinfo_write(struct file *, const char __user *, size_t, loff_t *);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* _LINUX_SLAB_H */
|
#endif /* _LINUX_SLAB_H */
|
||||||
|
|
16
mm/slab.c
16
mm/slab.c
|
@ -4259,7 +4259,7 @@ static int s_show(struct seq_file *m, void *p)
|
||||||
* + further values on SMP and with statistics enabled
|
* + further values on SMP and with statistics enabled
|
||||||
*/
|
*/
|
||||||
|
|
||||||
const struct seq_operations slabinfo_op = {
|
static const struct seq_operations slabinfo_op = {
|
||||||
.start = s_start,
|
.start = s_start,
|
||||||
.next = s_next,
|
.next = s_next,
|
||||||
.stop = s_stop,
|
.stop = s_stop,
|
||||||
|
@ -4316,6 +4316,19 @@ ssize_t slabinfo_write(struct file *file, const char __user * buffer,
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int slabinfo_open(struct inode *inode, struct file *file)
|
||||||
|
{
|
||||||
|
return seq_open(file, &slabinfo_op);
|
||||||
|
}
|
||||||
|
|
||||||
|
static const struct file_operations proc_slabinfo_operations = {
|
||||||
|
.open = slabinfo_open,
|
||||||
|
.read = seq_read,
|
||||||
|
.write = slabinfo_write,
|
||||||
|
.llseek = seq_lseek,
|
||||||
|
.release = seq_release,
|
||||||
|
};
|
||||||
|
|
||||||
#ifdef CONFIG_DEBUG_SLAB_LEAK
|
#ifdef CONFIG_DEBUG_SLAB_LEAK
|
||||||
|
|
||||||
static void *leaks_start(struct seq_file *m, loff_t *pos)
|
static void *leaks_start(struct seq_file *m, loff_t *pos)
|
||||||
|
@ -4478,6 +4491,7 @@ static const struct file_operations proc_slabstats_operations = {
|
||||||
|
|
||||||
static int __init slab_proc_init(void)
|
static int __init slab_proc_init(void)
|
||||||
{
|
{
|
||||||
|
proc_create("slabinfo",S_IWUSR|S_IRUGO,NULL,&proc_slabinfo_operations);
|
||||||
#ifdef CONFIG_DEBUG_SLAB_LEAK
|
#ifdef CONFIG_DEBUG_SLAB_LEAK
|
||||||
proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations);
|
proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations);
|
||||||
#endif
|
#endif
|
||||||
|
|
29
mm/slub.c
29
mm/slub.c
|
@ -14,6 +14,7 @@
|
||||||
#include <linux/interrupt.h>
|
#include <linux/interrupt.h>
|
||||||
#include <linux/bitops.h>
|
#include <linux/bitops.h>
|
||||||
#include <linux/slab.h>
|
#include <linux/slab.h>
|
||||||
|
#include <linux/proc_fs.h>
|
||||||
#include <linux/seq_file.h>
|
#include <linux/seq_file.h>
|
||||||
#include <linux/cpu.h>
|
#include <linux/cpu.h>
|
||||||
#include <linux/cpuset.h>
|
#include <linux/cpuset.h>
|
||||||
|
@ -4417,14 +4418,6 @@ __initcall(slab_sysfs_init);
|
||||||
* The /proc/slabinfo ABI
|
* The /proc/slabinfo ABI
|
||||||
*/
|
*/
|
||||||
#ifdef CONFIG_SLABINFO
|
#ifdef CONFIG_SLABINFO
|
||||||
|
|
||||||
ssize_t slabinfo_write(struct file *file, const char __user *buffer,
|
|
||||||
size_t count, loff_t *ppos)
|
|
||||||
{
|
|
||||||
return -EINVAL;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
static void print_slabinfo_header(struct seq_file *m)
|
static void print_slabinfo_header(struct seq_file *m)
|
||||||
{
|
{
|
||||||
seq_puts(m, "slabinfo - version: 2.1\n");
|
seq_puts(m, "slabinfo - version: 2.1\n");
|
||||||
|
@ -4492,11 +4485,29 @@ static int s_show(struct seq_file *m, void *p)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
const struct seq_operations slabinfo_op = {
|
static const struct seq_operations slabinfo_op = {
|
||||||
.start = s_start,
|
.start = s_start,
|
||||||
.next = s_next,
|
.next = s_next,
|
||||||
.stop = s_stop,
|
.stop = s_stop,
|
||||||
.show = s_show,
|
.show = s_show,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static int slabinfo_open(struct inode *inode, struct file *file)
|
||||||
|
{
|
||||||
|
return seq_open(file, &slabinfo_op);
|
||||||
|
}
|
||||||
|
|
||||||
|
static const struct file_operations proc_slabinfo_operations = {
|
||||||
|
.open = slabinfo_open,
|
||||||
|
.read = seq_read,
|
||||||
|
.llseek = seq_lseek,
|
||||||
|
.release = seq_release,
|
||||||
|
};
|
||||||
|
|
||||||
|
static int __init slab_proc_init(void)
|
||||||
|
{
|
||||||
|
proc_create("slabinfo",S_IWUSR|S_IRUGO,NULL,&proc_slabinfo_operations);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
module_init(slab_proc_init);
|
||||||
#endif /* CONFIG_SLABINFO */
|
#endif /* CONFIG_SLABINFO */
|
||||||
|
|
Loading…
Reference in New Issue