Commit 9303e0c4 authored by Li Zefan's avatar Li Zefan Committed by Linus Torvalds

cpuset: remove unneeded NODEMASK_ALLOC() in cpuset_sprintf_memlist()

It's not necessary to copy cpuset->mems_allowed to a buffer allocated by
NODEMASK_ALLOC().  Just pass it to nodelist_scnprintf().

As spotted by Paul, a side effect is we fix a bug that the function can
return -ENOMEM but the caller doesn't expect negative return value.
Therefore change the return value of cpuset_sprintf_cpulist() and
cpuset_sprintf_memlist() from int to size_t.
Signed-off-by: default avatarLi Zefan <lizf@cn.fujitsu.com>
Acked-by: default avatarPaul Menage <menage@google.com>
Acked-by: default avatarDavid Rientjes <rientjes@google.com>
Cc: Miao Xie <miaox@cn.fujitsu.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f9434ad1
...@@ -1610,34 +1610,26 @@ static int cpuset_write_resmask(struct cgroup *cgrp, struct cftype *cft, ...@@ -1610,34 +1610,26 @@ static int cpuset_write_resmask(struct cgroup *cgrp, struct cftype *cft,
* across a page fault. * across a page fault.
*/ */
static int cpuset_sprintf_cpulist(char *page, struct cpuset *cs) static size_t cpuset_sprintf_cpulist(char *page, struct cpuset *cs)
{ {
int ret; size_t count;
mutex_lock(&callback_mutex); mutex_lock(&callback_mutex);
ret = cpulist_scnprintf(page, PAGE_SIZE, cs->cpus_allowed); count = cpulist_scnprintf(page, PAGE_SIZE, cs->cpus_allowed);
mutex_unlock(&callback_mutex); mutex_unlock(&callback_mutex);
return ret; return count;
} }
static int cpuset_sprintf_memlist(char *page, struct cpuset *cs) static size_t cpuset_sprintf_memlist(char *page, struct cpuset *cs)
{ {
NODEMASK_ALLOC(nodemask_t, mask, GFP_KERNEL); size_t count;
int retval;
if (mask == NULL)
return -ENOMEM;
mutex_lock(&callback_mutex); mutex_lock(&callback_mutex);
*mask = cs->mems_allowed; count = nodelist_scnprintf(page, PAGE_SIZE, cs->mems_allowed);
mutex_unlock(&callback_mutex); mutex_unlock(&callback_mutex);
retval = nodelist_scnprintf(page, PAGE_SIZE, *mask); return count;
NODEMASK_FREE(mask);
return retval;
} }
static ssize_t cpuset_common_file_read(struct cgroup *cont, static ssize_t cpuset_common_file_read(struct cgroup *cont,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment