Commit 52e039f9 authored by Waiman Long's avatar Waiman Long Committed by Tejun Heo
Browse files

cgroup/cpuset: Remove unneeded goto in sched_partition_write() and rename it 



The goto statement in sched_partition_write() is not needed. Remove
it and rename sched_partition_write()/sched_partition_show() to
cpuset_partition_write()/cpuset_partition_show().

Signed-off-by: default avatarWaiman Long <longman@redhat.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent f0a0bd3d

kernel/cgroup/cpuset.c

+6 −9
Original line number Diff line number Diff line
@@ -3272,7 +3272,7 @@ int cpuset_common_seq_show(struct seq_file *sf, void *v) 
	return ret;

}



static int sched_partition_show(struct seq_file *seq, void *v)

static int cpuset_partition_show(struct seq_file *seq, void *v)

{

	struct cpuset *cs = css_cs(seq_css(seq));

	const char *err, *type = NULL;
@@ -3303,7 +3303,7 @@ static int sched_partition_show(struct seq_file *seq, void *v) 
	return 0;

}



static ssize_t sched_partition_write(struct kernfs_open_file *of, char *buf,

static ssize_t cpuset_partition_write(struct kernfs_open_file *of, char *buf,

				     size_t nbytes, loff_t off)

{

	struct cpuset *cs = css_cs(of_css(of));
@@ -3324,11 +3324,8 @@ static ssize_t sched_partition_write(struct kernfs_open_file *of, char *buf, 
	css_get(&cs->css);

	cpus_read_lock();

	mutex_lock(&cpuset_mutex);

	if (!is_cpuset_online(cs))

		goto out_unlock;



	if (is_cpuset_online(cs))

		retval = update_prstate(cs, val);

out_unlock:

	mutex_unlock(&cpuset_mutex);

	cpus_read_unlock();

	css_put(&cs->css);
@@ -3372,8 +3369,8 @@ static struct cftype dfl_files[] = { 


	{

		.name = "cpus.partition",

		.seq_show = sched_partition_show,

		.write = sched_partition_write,

		.seq_show = cpuset_partition_show,

		.write = cpuset_partition_write,

		.private = FILE_PARTITION_ROOT,

		.flags = CFTYPE_NOT_ON_ROOT,

		.file_offset = offsetof(struct cpuset, partition_file),