From d25871bccf58ea887bce9dca1ceeaa69bd8b8e38 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Fri, 30 Sep 2005 03:26:43 +0100
Subject: [PATCH] --- yaml --- r: 9473 b: refs/heads/master c:
 eacaa1f5aa4a41a48349f55abcd9258506943e76 h: refs/heads/master i:   9471:
 4661b396524078461edecbb155322d744ee91987 v: v3

---
 [refs]                |  2 +-
 trunk/kernel/cpuset.c | 12 +-----------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index be98b700e3e7..d57346fc9783 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46d7031ecb8a8360b0022abd8014f38cc1197166
+refs/heads/master: eacaa1f5aa4a41a48349f55abcd9258506943e76
diff --git a/trunk/kernel/cpuset.c b/trunk/kernel/cpuset.c
index 6a6e87b2f2fd..45a5719a0104 100644
--- a/trunk/kernel/cpuset.c
+++ b/trunk/kernel/cpuset.c
@@ -968,8 +968,6 @@ static ssize_t cpuset_common_file_read(struct file *file, char __user *buf,
 	char *page;
 	ssize_t retval = 0;
 	char *s;
-	char *start;
-	ssize_t n;
 
 	if (!(page = (char *)__get_free_page(GFP_KERNEL)))
 		return -ENOMEM;
@@ -999,15 +997,7 @@ static ssize_t cpuset_common_file_read(struct file *file, char __user *buf,
 	*s++ = '\n';
 	*s = '\0';
 
-	start = page + *ppos;
-	n = s - start;
-
-	/* Do nothing if *ppos is at the eof or beyond the eof. */
-	if (n <= 0)
-		goto out;
-
-	retval = n - copy_to_user(buf, start, min(n, nbytes));
-	*ppos += retval;
+	retval = simple_read_from_buffer(buf, nbytes, ppos, page, s - page);
 out:
 	free_page((unsigned long)page);
 	return retval;