[PATCH 3/3] cgroups: remove calls to simple_kstrtoll

Daniel Walker dwalker at fifo99.com
Sat Oct 26 02:33:13 UTC 2013


Signed-off-by: Daniel Walker <dwalker at fifo99.com>
---
 kernel/cgroup.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 41f71c3..bf8b891 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -2276,7 +2276,7 @@ static ssize_t cgroup_write_X64(struct cgroup_subsys_state *css,
 {
 	char buffer[CGROUP_LOCAL_BUFFER_SIZE];
 	int retval = 0;
-	char *end;
+	int ret;
 
 	if (!nbytes)
 		return -EINVAL;
@@ -2287,13 +2287,15 @@ static ssize_t cgroup_write_X64(struct cgroup_subsys_state *css,
 
 	buffer[nbytes] = 0;     /* nul-terminate */
 	if (cft->write_u64) {
-		u64 val = simple_strtoull(strstrip(buffer), &end, 0);
-		if (*end)
+		u64 val;
+		ret = kstrtoull(strstrip(buffer), 0, &val);
+		if (ret != 0)
 			return -EINVAL;
 		retval = cft->write_u64(css, cft, val);
 	} else {
-		s64 val = simple_strtoll(strstrip(buffer), &end, 0);
-		if (*end)
+		s64 val;
+		ret = kstrtoll(strstrip(buffer), 0, &val);
+		if (ret != 0)
 			return -EINVAL;
 		retval = cft->write_s64(css, cft, val);
 	}
-- 
1.8.3.2



More information about the Containers mailing list