GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-07 07:08:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cpuset: remove unneeded NODEMASK_ALLOC() in cpuset_sprintf_memlist()

Browse source 
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: Li Zefan <lizf@cn.fujitsu.com>
Acked-by: Paul Menage <menage@google.com>
Acked-by: David Rientjes <rientjes@google.com>
Cc: Miao Xie <miaox@cn.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Li Zefan 2011-03-23 16:42:45 -07:00 • committed by Linus Torvalds
parent f9434ad155
commit 9303e0c481
1 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
kernel/cpuset.c
View file

@ -1610,34 +1610,26 @@ out:
* 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,