|
@@ -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);
|
|
|
|
- int retval;
|
|
|
|
-
|
|
|
|
- if (mask == NULL)
|
|
|
|
- return -ENOMEM;
|
|
|
|
|
|
+ size_t count;
|
|
|
|
|
|
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);
|
|
|
|
-
|
|
|
|
- NODEMASK_FREE(mask);
|
|
|
|
-
|
|
|
|
- return retval;
|
|
|
|
|
|
+ return count;
|
|
}
|
|
}
|
|
|
|
|
|
static ssize_t cpuset_common_file_read(struct cgroup *cont,
|
|
static ssize_t cpuset_common_file_read(struct cgroup *cont,
|