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

Commit 8d8b97ba authored by Al Viro's avatar Al Viro
Browse files

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



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 4c237820

fs/proc/base.c

+31 −0
Original line number Diff line number Diff line
@@ -404,6 +404,37 @@ static const struct file_operations proc_lstats_operations = { 


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

{

	unsigned long totalpages = totalram_pages + total_swap_pages;

include/linux/cgroup.h

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ extern int cgroupstats_build(struct cgroupstats *stats, 
extern int cgroup_load_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 SUBSYS(_x) _x ## _subsys_id,

include/linux/cpuset.h

+1 −2
Original line number Diff line number Diff line
@@ -64,10 +64,9 @@ extern int cpuset_mems_allowed_intersects(const struct task_struct *tsk1, 
extern int cpuset_memory_pressure_enabled;

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,

					struct task_struct *task);

extern int proc_cpuset_show(struct seq_file *, void *);



extern int cpuset_mem_spread_node(void);

extern int cpuset_slab_spread_node(void);

kernel/cgroup.c

+1 −14
Original line number Diff line number Diff line
@@ -4769,7 +4769,7 @@ int __init cgroup_init(void) 
 */



/* 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 task_struct *tsk;
@@ -4821,19 +4821,6 @@ static int proc_cgroup_show(struct seq_file *m, void *v) 
	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 */

static int proc_cgroupstats_show(struct seq_file *m, void *v)

{

kernel/cpuset.c

+1 −14
Original line number Diff line number Diff line
@@ -2666,7 +2666,7 @@ void __cpuset_memory_pressure_bump(void) 
 *    and we take cpuset_mutex, keeping cpuset_attach() from changing it

 *    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 task_struct *tsk;
@@ -2700,19 +2700,6 @@ static int proc_cpuset_show(struct seq_file *m, void *unused_v) 
out:

	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 */



/* Display task mems_allowed in /proc/<pid>/status file. */