openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

take cgroup_open() and cpuset_open() to fs/proc/base.c 

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2013-04-19 23:11:24 -04:00
parent 4c23782091
commit 8d8b97ba49
5 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
fs/proc/base.c
View File

@ -404,6 +404,37 @@ static const struct file_operations proc_lstats_operations = {
#endif #endif
#ifdef CONFIG_CGROUPS
static int cgroup_open(struct inode *inode, struct file *file)
{
struct pid *pid = PROC_I(inode)->pid;
return single_open(file, proc_cgroup_show, pid);
}
static const struct file_operations proc_cgroup_operations = {
.open = cgroup_open,
.read = seq_read,
.llseek = seq_lseek,
.release = single_release,
};
#endif
#ifdef CONFIG_PROC_PID_CPUSET
static int cpuset_open(struct inode *inode, struct file *file)
{
struct pid *pid = PROC_I(inode)->pid;
return single_open(file, proc_cpuset_show, pid);
}
static const struct file_operations proc_cpuset_operations = {
.open = cpuset_open,
.read = seq_read,
.llseek = seq_lseek,
.release = single_release,
};
#endif
static int proc_oom_score(struct task_struct *task, char *buffer) static int proc_oom_score(struct task_struct *task, char *buffer)
{ {
unsigned long totalpages = totalram_pages + total_swap_pages; unsigned long totalpages = totalram_pages + total_swap_pages;

2
include/linux/cgroup.h
View File

@ -42,7 +42,7 @@ extern int cgroupstats_build(struct cgroupstats *stats,
extern int cgroup_load_subsys(struct cgroup_subsys *ss); extern int cgroup_load_subsys(struct cgroup_subsys *ss);
extern void cgroup_unload_subsys(struct cgroup_subsys *ss); extern void cgroup_unload_subsys(struct cgroup_subsys *ss);
extern const struct file_operations proc_cgroup_operations; extern int proc_cgroup_show(struct seq_file *, void *);
/* Define the enumeration of all builtin cgroup subsystems */ /* Define the enumeration of all builtin cgroup subsystems */
#define SUBSYS(_x) _x ## _subsys_id, #define SUBSYS(_x) _x ## _subsys_id,

3
include/linux/cpuset.h
View File

@ -64,10 +64,9 @@ extern int cpuset_mems_allowed_intersects(const struct task_struct *tsk1,
extern int cpuset_memory_pressure_enabled; extern int cpuset_memory_pressure_enabled;
extern void __cpuset_memory_pressure_bump(void); extern void __cpuset_memory_pressure_bump(void);
extern const struct file_operations proc_cpuset_operations;
struct seq_file;
extern void cpuset_task_status_allowed(struct seq_file *m, extern void cpuset_task_status_allowed(struct seq_file *m,
struct task_struct *task); struct task_struct *task);
extern int proc_cpuset_show(struct seq_file *, void *);
extern int cpuset_mem_spread_node(void); extern int cpuset_mem_spread_node(void);
extern int cpuset_slab_spread_node(void); extern int cpuset_slab_spread_node(void);

15
kernel/cgroup.c
View File

@ -4769,7 +4769,7 @@ int __init cgroup_init(void)
*/ */
/* TODO: Use a proper seq_file iterator */ /* TODO: Use a proper seq_file iterator */
static int proc_cgroup_show(struct seq_file *m, void *v) int proc_cgroup_show(struct seq_file *m, void *v)
{ {
struct pid *pid; struct pid *pid;
struct task_struct *tsk; struct task_struct *tsk;
@ -4821,19 +4821,6 @@ static int proc_cgroup_show(struct seq_file *m, void *v)
return retval; return retval;
} }
static int cgroup_open(struct inode *inode, struct file *file)
{
struct pid *pid = PROC_I(inode)->pid;
return single_open(file, proc_cgroup_show, pid);
}
const struct file_operations proc_cgroup_operations = {
.open = cgroup_open,
.read = seq_read,
.llseek = seq_lseek,
.release = single_release,
};
/* Display information about each subsystem and each hierarchy */ /* Display information about each subsystem and each hierarchy */
static int proc_cgroupstats_show(struct seq_file *m, void *v) static int proc_cgroupstats_show(struct seq_file *m, void *v)
{ {

15
kernel/cpuset.c
View File

@ -2666,7 +2666,7 @@ void __cpuset_memory_pressure_bump(void)
* and we take cpuset_mutex, keeping cpuset_attach() from changing it * and we take cpuset_mutex, keeping cpuset_attach() from changing it
* anyway. * anyway.
*/ */
static int proc_cpuset_show(struct seq_file *m, void *unused_v) int proc_cpuset_show(struct seq_file *m, void *unused_v)
{ {
struct pid *pid; struct pid *pid;
struct task_struct *tsk; struct task_struct *tsk;
@ -2700,19 +2700,6 @@ static int proc_cpuset_show(struct seq_file *m, void *unused_v)
out: out:
return retval; return retval;
} }
static int cpuset_open(struct inode *inode, struct file *file)
{
struct pid *pid = PROC_I(inode)->pid;
return single_open(file, proc_cpuset_show, pid);
}
const struct file_operations proc_cpuset_operations = {
.open = cpuset_open,
.read = seq_read,
.llseek = seq_lseek,
.release = single_release,
};
#endif /* CONFIG_PROC_PID_CPUSET */ #endif /* CONFIG_PROC_PID_CPUSET */
/* Display task mems_allowed in /proc/<pid>/status file. */ /* Display task mems_allowed in /proc/<pid>/status file. */