From: Paul Menage Date: Thu, 7 Dec 2006 04:41:37 +0000 (-0800) Subject: [PATCH] cpuset: allow a larger buffer for writes to cpuset files X-Git-Tag: v2.6.20-rc1~145^2^2~10 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d3ed11c35635487d34ad476e1d6a66dd298ab2de;p=linux-2.6-omap-h63xx.git [PATCH] cpuset: allow a larger buffer for writes to cpuset files When using fake NUMA setup, the number of memory nodes can greatly exceed the number of CPUs. So the current limit in cpuset_common_file_write() is insufficient. Signed-off-by: Paul Menage Acked-by: Paul Jackson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/kernel/cpuset.c b/kernel/cpuset.c index 4ef1d29297c..0a6b4d89f9a 100644 --- a/kernel/cpuset.c +++ b/kernel/cpuset.c @@ -1280,7 +1280,8 @@ typedef enum { FILE_TASKLIST, } cpuset_filetype_t; -static ssize_t cpuset_common_file_write(struct file *file, const char __user *userbuf, +static ssize_t cpuset_common_file_write(struct file *file, + const char __user *userbuf, size_t nbytes, loff_t *unused_ppos) { struct cpuset *cs = __d_cs(file->f_dentry->d_parent); @@ -1291,7 +1292,7 @@ static ssize_t cpuset_common_file_write(struct file *file, const char __user *us int retval = 0; /* Crude upper limit on largest legitimate cpulist user might write. */ - if (nbytes > 100 + 6 * NR_CPUS) + if (nbytes > 100 + 6 * max(NR_CPUS, MAX_NUMNODES)) return -E2BIG; /* +1 for nul-terminator */