linux-next: build failure after merge of the akpm-current tree

Stephen Rothwell
2014-05-14T07:47:57Z

[-- Attachment #1: Type: text/plain, Size: 1963 bytes --]

Hi Andrew,

After merging the akpm-current tree, today's linux-next build (x86_64
allmodconfig) failed like this:

mm/memcontrol.c: In function 'mem_cgroup_write':
mm/memcontrol.c:5088:45: error: 'buffer' undeclared (first use in this function)
ret = res_counter_memparse_write_strategy(buffer, &val);
^
mm/memcontrol.c: At top level:
/scratch/sfr/next/mm/memcontrol.c:6029:3: error: unknown field 'write_string' specified in initializer
.write_string = mem_cgroup_write,
^

Caused by commit a4bf584ed8c2 ("memcg: allow setting low_limit")
interacting with commit 451af504df0c ("cgroup: replace
cftype->write_string() with cftype->write()") from the cgroup tree.
(I love API changes and unnecessary variable renaming :-()

I applied the following merge fix patch and can carry it as necessary:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 14 May 2014 17:42:00 +1000
Subject: [PATCH] memcg: update for change from write_string() to write()

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
mm/memcontrol.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 493175e616e3..98e38b50cc82 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -5085,7 +5085,7 @@ static ssize_t mem_cgroup_write(struct kernfs_open_file *of,
ret = -EINVAL;
break;
}
- ret = res_counter_memparse_write_strategy(buffer, &val);
+ ret = res_counter_memparse_write_strategy(buf, &val);
if (ret)
break;
if (type == _MEM) {
@@ -6026,7 +6026,7 @@ static struct cftype mem_cgroup_files[] = {
{
.name = "low_limit_in_bytes",
.private = MEMFILE_PRIVATE(_MEM, RES_LOW_LIMIT),
- .write_string = mem_cgroup_write,
+ .write = mem_cgroup_write,
.read_u64 = mem_cgroup_read_u64,
},
{
--
2.0.0.rc2

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]