aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorPaul Menage <menage@google.com>2008-04-29 03:59:56 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-29 11:06:07 -0400
commitf4c753b7eacc277e506066abdda351cbc1cf8e6a (patch)
tree2510264d4fac836dc64acd700846a5fe8d960b1e /kernel
parent3ff31d0cca38b3c20e88a022bf38c4f7c98492f0 (diff)
CGroup API files: rename read/write_uint methods to read_write_u64
Several people have justifiably complained that the "_uint" suffix is inappropriate for functions that handle u64 values, so this patch just renames all these functions and their users to have the suffic _u64. [peterz@infradead.org: build fix] Signed-off-by: Paul Menage <menage@google.com> Cc: "Li Zefan" <lizf@cn.fujitsu.com> Cc: Balbir Singh <balbir@in.ibm.com> Cc: Paul Jackson <pj@sgi.com> Cc: Pavel Emelyanov <xemul@openvz.org> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: "YAMAMOTO Takashi" <yamamoto@valinux.co.jp> Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/cgroup.c32
-rw-r--r--kernel/cgroup_debug.c8
-rw-r--r--kernel/sched.c16
3 files changed, 28 insertions, 28 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 068f58da855..0bd79a81666 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -1311,10 +1311,10 @@ enum cgroup_filetype {
1311 FILE_RELEASE_AGENT, 1311 FILE_RELEASE_AGENT,
1312}; 1312};
1313 1313
1314static ssize_t cgroup_write_uint(struct cgroup *cgrp, struct cftype *cft, 1314static ssize_t cgroup_write_u64(struct cgroup *cgrp, struct cftype *cft,
1315 struct file *file, 1315 struct file *file,
1316 const char __user *userbuf, 1316 const char __user *userbuf,
1317 size_t nbytes, loff_t *unused_ppos) 1317 size_t nbytes, loff_t *unused_ppos)
1318{ 1318{
1319 char buffer[64]; 1319 char buffer[64];
1320 int retval = 0; 1320 int retval = 0;
@@ -1338,7 +1338,7 @@ static ssize_t cgroup_write_uint(struct cgroup *cgrp, struct cftype *cft,
1338 return -EINVAL; 1338 return -EINVAL;
1339 1339
1340 /* Pass to subsystem */ 1340 /* Pass to subsystem */
1341 retval = cft->write_uint(cgrp, cft, val); 1341 retval = cft->write_u64(cgrp, cft, val);
1342 if (!retval) 1342 if (!retval)
1343 retval = nbytes; 1343 retval = nbytes;
1344 return retval; 1344 return retval;
@@ -1419,18 +1419,18 @@ static ssize_t cgroup_file_write(struct file *file, const char __user *buf,
1419 return -ENODEV; 1419 return -ENODEV;
1420 if (cft->write) 1420 if (cft->write)
1421 return cft->write(cgrp, cft, file, buf, nbytes, ppos); 1421 return cft->write(cgrp, cft, file, buf, nbytes, ppos);
1422 if (cft->write_uint) 1422 if (cft->write_u64)
1423 return cgroup_write_uint(cgrp, cft, file, buf, nbytes, ppos); 1423 return cgroup_write_u64(cgrp, cft, file, buf, nbytes, ppos);
1424 return -EINVAL; 1424 return -EINVAL;
1425} 1425}
1426 1426
1427static ssize_t cgroup_read_uint(struct cgroup *cgrp, struct cftype *cft, 1427static ssize_t cgroup_read_u64(struct cgroup *cgrp, struct cftype *cft,
1428 struct file *file, 1428 struct file *file,
1429 char __user *buf, size_t nbytes, 1429 char __user *buf, size_t nbytes,
1430 loff_t *ppos) 1430 loff_t *ppos)
1431{ 1431{
1432 char tmp[64]; 1432 char tmp[64];
1433 u64 val = cft->read_uint(cgrp, cft); 1433 u64 val = cft->read_u64(cgrp, cft);
1434 int len = sprintf(tmp, "%llu\n", (unsigned long long) val); 1434 int len = sprintf(tmp, "%llu\n", (unsigned long long) val);
1435 1435
1436 return simple_read_from_buffer(buf, nbytes, ppos, tmp, len); 1436 return simple_read_from_buffer(buf, nbytes, ppos, tmp, len);
@@ -1490,8 +1490,8 @@ static ssize_t cgroup_file_read(struct file *file, char __user *buf,
1490 1490
1491 if (cft->read) 1491 if (cft->read)
1492 return cft->read(cgrp, cft, file, buf, nbytes, ppos); 1492 return cft->read(cgrp, cft, file, buf, nbytes, ppos);
1493 if (cft->read_uint) 1493 if (cft->read_u64)
1494 return cgroup_read_uint(cgrp, cft, file, buf, nbytes, ppos); 1494 return cgroup_read_u64(cgrp, cft, file, buf, nbytes, ppos);
1495 return -EINVAL; 1495 return -EINVAL;
1496} 1496}
1497 1497
@@ -2158,14 +2158,14 @@ static struct cftype files[] = {
2158 2158
2159 { 2159 {
2160 .name = "notify_on_release", 2160 .name = "notify_on_release",
2161 .read_uint = cgroup_read_notify_on_release, 2161 .read_u64 = cgroup_read_notify_on_release,
2162 .write = cgroup_common_file_write, 2162 .write = cgroup_common_file_write,
2163 .private = FILE_NOTIFY_ON_RELEASE, 2163 .private = FILE_NOTIFY_ON_RELEASE,
2164 }, 2164 },
2165 2165
2166 { 2166 {
2167 .name = "releasable", 2167 .name = "releasable",
2168 .read_uint = cgroup_read_releasable, 2168 .read_u64 = cgroup_read_releasable,
2169 .private = FILE_RELEASABLE, 2169 .private = FILE_RELEASABLE,
2170 } 2170 }
2171}; 2171};
diff --git a/kernel/cgroup_debug.c b/kernel/cgroup_debug.c
index 37301e877cb..cbb7a26f4ea 100644
--- a/kernel/cgroup_debug.c
+++ b/kernel/cgroup_debug.c
@@ -65,21 +65,21 @@ static u64 current_css_set_refcount_read(struct cgroup *cont,
65static struct cftype files[] = { 65static struct cftype files[] = {
66 { 66 {
67 .name = "cgroup_refcount", 67 .name = "cgroup_refcount",
68 .read_uint = cgroup_refcount_read, 68 .read_u64 = cgroup_refcount_read,
69 }, 69 },
70 { 70 {
71 .name = "taskcount", 71 .name = "taskcount",
72 .read_uint = taskcount_read, 72 .read_u64 = taskcount_read,
73 }, 73 },
74 74
75 { 75 {
76 .name = "current_css_set", 76 .name = "current_css_set",
77 .read_uint = current_css_set_read, 77 .read_u64 = current_css_set_read,
78 }, 78 },
79 79
80 { 80 {
81 .name = "current_css_set_refcount", 81 .name = "current_css_set_refcount",
82 .read_uint = current_css_set_refcount_read, 82 .read_u64 = current_css_set_refcount_read,
83 }, 83 },
84}; 84};
85 85
diff --git a/kernel/sched.c b/kernel/sched.c
index 740fb409e5b..2528fbd974b 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -9057,13 +9057,13 @@ cpu_cgroup_attach(struct cgroup_subsys *ss, struct cgroup *cgrp,
9057} 9057}
9058 9058
9059#ifdef CONFIG_FAIR_GROUP_SCHED 9059#ifdef CONFIG_FAIR_GROUP_SCHED
9060static int cpu_shares_write_uint(struct cgroup *cgrp, struct cftype *cftype, 9060static int cpu_shares_write_u64(struct cgroup *cgrp, struct cftype *cftype,
9061 u64 shareval) 9061 u64 shareval)
9062{ 9062{
9063 return sched_group_set_shares(cgroup_tg(cgrp), shareval); 9063 return sched_group_set_shares(cgroup_tg(cgrp), shareval);
9064} 9064}
9065 9065
9066static u64 cpu_shares_read_uint(struct cgroup *cgrp, struct cftype *cft) 9066static u64 cpu_shares_read_u64(struct cgroup *cgrp, struct cftype *cft)
9067{ 9067{
9068 struct task_group *tg = cgroup_tg(cgrp); 9068 struct task_group *tg = cgroup_tg(cgrp);
9069 9069
@@ -9133,8 +9133,8 @@ static struct cftype cpu_files[] = {
9133#ifdef CONFIG_FAIR_GROUP_SCHED 9133#ifdef CONFIG_FAIR_GROUP_SCHED
9134 { 9134 {
9135 .name = "shares", 9135 .name = "shares",
9136 .read_uint = cpu_shares_read_uint, 9136 .read_u64 = cpu_shares_read_u64,
9137 .write_uint = cpu_shares_write_uint, 9137 .write_u64 = cpu_shares_write_u64,
9138 }, 9138 },
9139#endif 9139#endif
9140#ifdef CONFIG_RT_GROUP_SCHED 9140#ifdef CONFIG_RT_GROUP_SCHED
@@ -9145,8 +9145,8 @@ static struct cftype cpu_files[] = {
9145 }, 9145 },
9146 { 9146 {
9147 .name = "rt_period_us", 9147 .name = "rt_period_us",
9148 .read_uint = cpu_rt_period_read_uint, 9148 .read_u64 = cpu_rt_period_read_uint,
9149 .write_uint = cpu_rt_period_write_uint, 9149 .write_u64 = cpu_rt_period_write_uint,
9150 }, 9150 },
9151#endif 9151#endif
9152}; 9152};
@@ -9277,8 +9277,8 @@ out:
9277static struct cftype files[] = { 9277static struct cftype files[] = {
9278 { 9278 {
9279 .name = "usage", 9279 .name = "usage",
9280 .read_uint = cpuusage_read, 9280 .read_u64 = cpuusage_read,
9281 .write_uint = cpuusage_write, 9281 .write_u64 = cpuusage_write,
9282 }, 9282 },
9283}; 9283};
9284 9284