aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2014-03-19 10:23:54 -0400
committerTejun Heo <tj@kernel.org>2014-03-19 10:23:54 -0400
commit4d3bb511b5f9980fc3e9ae5939ebc475b231d3fc (patch)
tree1446858f230b5e9a3d0b3f23dd5bc9bc307ef411
parent3dd06ffa9df99aa88f4e01eaa0c9d3cb362430b0 (diff)
cgroup: drop const from @buffer of cftype->write_string()
cftype->write_string() just passes on the writeable buffer from kernfs and there's no reason to add const restriction on the buffer. The only thing const achieves is unnecessarily complicating parsing of the buffer. Drop const from @buffer. Signed-off-by: Tejun Heo <tj@kernel.org> Acked-by: Li Zefan <lizefan@huawei.com> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Paul Mackerras <paulus@samba.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> Cc: Daniel Borkmann <dborkman@redhat.com> Cc: Michal Hocko <mhocko@suse.cz> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: Balbir Singh <bsingharora@gmail.com> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
-rw-r--r--block/blk-throttle.c4
-rw-r--r--block/cfq-iosched.c4
-rw-r--r--include/linux/cgroup.h2
-rw-r--r--kernel/cgroup.c2
-rw-r--r--kernel/cgroup_freezer.c2
-rw-r--r--kernel/cpuset.c2
-rw-r--r--mm/hugetlb_cgroup.c2
-rw-r--r--mm/memcontrol.c4
-rw-r--r--net/core/netprio_cgroup.c2
-rw-r--r--net/ipv4/tcp_memcontrol.c2
-rw-r--r--security/device_cgroup.c4
11 files changed, 15 insertions, 15 deletions
diff --git a/block/blk-throttle.c b/block/blk-throttle.c
index 861c363e4129..033745cd7fba 100644
--- a/block/blk-throttle.c
+++ b/block/blk-throttle.c
@@ -1408,13 +1408,13 @@ static int tg_set_conf(struct cgroup_subsys_state *css, struct cftype *cft,
1408} 1408}
1409 1409
1410static int tg_set_conf_u64(struct cgroup_subsys_state *css, struct cftype *cft, 1410static int tg_set_conf_u64(struct cgroup_subsys_state *css, struct cftype *cft,
1411 const char *buf) 1411 char *buf)
1412{ 1412{
1413 return tg_set_conf(css, cft, buf, true); 1413 return tg_set_conf(css, cft, buf, true);
1414} 1414}
1415 1415
1416static int tg_set_conf_uint(struct cgroup_subsys_state *css, struct cftype *cft, 1416static int tg_set_conf_uint(struct cgroup_subsys_state *css, struct cftype *cft,
1417 const char *buf) 1417 char *buf)
1418{ 1418{
1419 return tg_set_conf(css, cft, buf, false); 1419 return tg_set_conf(css, cft, buf, false);
1420} 1420}
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 461187943392..f5de45b6af36 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -1701,13 +1701,13 @@ static int __cfqg_set_weight_device(struct cgroup_subsys_state *css,
1701} 1701}
1702 1702
1703static int cfqg_set_weight_device(struct cgroup_subsys_state *css, 1703static int cfqg_set_weight_device(struct cgroup_subsys_state *css,
1704 struct cftype *cft, const char *buf) 1704 struct cftype *cft, char *buf)
1705{ 1705{
1706 return __cfqg_set_weight_device(css, cft, buf, false); 1706 return __cfqg_set_weight_device(css, cft, buf, false);
1707} 1707}
1708 1708
1709static int cfqg_set_leaf_weight_device(struct cgroup_subsys_state *css, 1709static int cfqg_set_leaf_weight_device(struct cgroup_subsys_state *css,
1710 struct cftype *cft, const char *buf) 1710 struct cftype *cft, char *buf)
1711{ 1711{
1712 return __cfqg_set_weight_device(css, cft, buf, true); 1712 return __cfqg_set_weight_device(css, cft, buf, true);
1713} 1713}
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index 77294fc66603..79993ac066c5 100644
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -454,7 +454,7 @@ struct cftype {
454 * Returns 0 or -ve error code. 454 * Returns 0 or -ve error code.
455 */ 455 */
456 int (*write_string)(struct cgroup_subsys_state *css, struct cftype *cft, 456 int (*write_string)(struct cgroup_subsys_state *css, struct cftype *cft,
457 const char *buffer); 457 char *buffer);
458 /* 458 /*
459 * trigger() callback can be used to get some kick from the 459 * trigger() callback can be used to get some kick from the
460 * userspace, when the actual string written is not important 460 * userspace, when the actual string written is not important
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 60ea16058c42..f5754910e80b 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -2143,7 +2143,7 @@ static int cgroup_procs_write(struct cgroup_subsys_state *css,
2143} 2143}
2144 2144
2145static int cgroup_release_agent_write(struct cgroup_subsys_state *css, 2145static int cgroup_release_agent_write(struct cgroup_subsys_state *css,
2146 struct cftype *cft, const char *buffer) 2146 struct cftype *cft, char *buffer)
2147{ 2147{
2148 struct cgroup_root *root = css->cgroup->root; 2148 struct cgroup_root *root = css->cgroup->root;
2149 2149
diff --git a/kernel/cgroup_freezer.c b/kernel/cgroup_freezer.c
index 2ea98b216bff..2bc4a2256444 100644
--- a/kernel/cgroup_freezer.c
+++ b/kernel/cgroup_freezer.c
@@ -442,7 +442,7 @@ static void freezer_change_state(struct freezer *freezer, bool freeze)
442} 442}
443 443
444static int freezer_write(struct cgroup_subsys_state *css, struct cftype *cft, 444static int freezer_write(struct cgroup_subsys_state *css, struct cftype *cft,
445 const char *buffer) 445 char *buffer)
446{ 446{
447 bool freeze; 447 bool freeze;
448 448
diff --git a/kernel/cpuset.c b/kernel/cpuset.c
index 8d5324583aa4..efbf9baf77ec 100644
--- a/kernel/cpuset.c
+++ b/kernel/cpuset.c
@@ -1610,7 +1610,7 @@ out_unlock:
1610 * Common handling for a write to a "cpus" or "mems" file. 1610 * Common handling for a write to a "cpus" or "mems" file.
1611 */ 1611 */
1612static int cpuset_write_resmask(struct cgroup_subsys_state *css, 1612static int cpuset_write_resmask(struct cgroup_subsys_state *css,
1613 struct cftype *cft, const char *buf) 1613 struct cftype *cft, char *buf)
1614{ 1614{
1615 struct cpuset *cs = css_cs(css); 1615 struct cpuset *cs = css_cs(css);
1616 struct cpuset *trialcs; 1616 struct cpuset *trialcs;
diff --git a/mm/hugetlb_cgroup.c b/mm/hugetlb_cgroup.c
index b135853e68f3..595d7fd795e1 100644
--- a/mm/hugetlb_cgroup.c
+++ b/mm/hugetlb_cgroup.c
@@ -254,7 +254,7 @@ static u64 hugetlb_cgroup_read_u64(struct cgroup_subsys_state *css,
254} 254}
255 255
256static int hugetlb_cgroup_write(struct cgroup_subsys_state *css, 256static int hugetlb_cgroup_write(struct cgroup_subsys_state *css,
257 struct cftype *cft, const char *buffer) 257 struct cftype *cft, char *buffer)
258{ 258{
259 int idx, name, ret; 259 int idx, name, ret;
260 unsigned long long val; 260 unsigned long long val;
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index d9c6ac1532e6..96f94a9f2faf 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -5242,7 +5242,7 @@ static int memcg_update_kmem_limit(struct mem_cgroup *memcg,
5242 * RES_LIMIT. 5242 * RES_LIMIT.
5243 */ 5243 */
5244static int mem_cgroup_write(struct cgroup_subsys_state *css, struct cftype *cft, 5244static int mem_cgroup_write(struct cgroup_subsys_state *css, struct cftype *cft,
5245 const char *buffer) 5245 char *buffer)
5246{ 5246{
5247 struct mem_cgroup *memcg = mem_cgroup_from_css(css); 5247 struct mem_cgroup *memcg = mem_cgroup_from_css(css);
5248 enum res_type type; 5248 enum res_type type;
@@ -6063,7 +6063,7 @@ static void memcg_event_ptable_queue_proc(struct file *file,
6063 * Interpretation of args is defined by control file implementation. 6063 * Interpretation of args is defined by control file implementation.
6064 */ 6064 */
6065static int memcg_write_event_control(struct cgroup_subsys_state *css, 6065static int memcg_write_event_control(struct cgroup_subsys_state *css,
6066 struct cftype *cft, const char *buffer) 6066 struct cftype *cft, char *buffer)
6067{ 6067{
6068 struct mem_cgroup *memcg = mem_cgroup_from_css(css); 6068 struct mem_cgroup *memcg = mem_cgroup_from_css(css);
6069 struct mem_cgroup_event *event; 6069 struct mem_cgroup_event *event;
diff --git a/net/core/netprio_cgroup.c b/net/core/netprio_cgroup.c
index f9f3a40d3350..3825f669147b 100644
--- a/net/core/netprio_cgroup.c
+++ b/net/core/netprio_cgroup.c
@@ -186,7 +186,7 @@ static int read_priomap(struct seq_file *sf, void *v)
186} 186}
187 187
188static int write_priomap(struct cgroup_subsys_state *css, struct cftype *cft, 188static int write_priomap(struct cgroup_subsys_state *css, struct cftype *cft,
189 const char *buffer) 189 char *buffer)
190{ 190{
191 char devname[IFNAMSIZ + 1]; 191 char devname[IFNAMSIZ + 1];
192 struct net_device *dev; 192 struct net_device *dev;
diff --git a/net/ipv4/tcp_memcontrol.c b/net/ipv4/tcp_memcontrol.c
index 20a0aca9131e..d4f015ad6c84 100644
--- a/net/ipv4/tcp_memcontrol.c
+++ b/net/ipv4/tcp_memcontrol.c
@@ -103,7 +103,7 @@ static int tcp_update_limit(struct mem_cgroup *memcg, u64 val)
103} 103}
104 104
105static int tcp_cgroup_write(struct cgroup_subsys_state *css, struct cftype *cft, 105static int tcp_cgroup_write(struct cgroup_subsys_state *css, struct cftype *cft,
106 const char *buffer) 106 char *buffer)
107{ 107{
108 struct mem_cgroup *memcg = mem_cgroup_from_css(css); 108 struct mem_cgroup *memcg = mem_cgroup_from_css(css);
109 unsigned long long val; 109 unsigned long long val;
diff --git a/security/device_cgroup.c b/security/device_cgroup.c
index 7f88bcde7c61..8365909f5f8c 100644
--- a/security/device_cgroup.c
+++ b/security/device_cgroup.c
@@ -496,7 +496,7 @@ static inline bool has_children(struct dev_cgroup *devcgroup)
496 * parent cgroup has the access you're asking for. 496 * parent cgroup has the access you're asking for.
497 */ 497 */
498static int devcgroup_update_access(struct dev_cgroup *devcgroup, 498static int devcgroup_update_access(struct dev_cgroup *devcgroup,
499 int filetype, const char *buffer) 499 int filetype, char *buffer)
500{ 500{
501 const char *b; 501 const char *b;
502 char temp[12]; /* 11 + 1 characters needed for a u32 */ 502 char temp[12]; /* 11 + 1 characters needed for a u32 */
@@ -652,7 +652,7 @@ static int devcgroup_update_access(struct dev_cgroup *devcgroup,
652} 652}
653 653
654static int devcgroup_access_write(struct cgroup_subsys_state *css, 654static int devcgroup_access_write(struct cgroup_subsys_state *css,
655 struct cftype *cft, const char *buffer) 655 struct cftype *cft, char *buffer)
656{ 656{
657 int retval; 657 int retval;
658 658