linux-kernel - linux-next: build failure after merge of the cgroup tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Wed, 26 Feb 2014 17:46:55 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Tejun Heo <tj@...nel.org>, Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Li Zefan <lizefan@...wei.com>
Subject: linux-next: build failure after merge of the cgroup tree

Hi Tejun,

After merging the cgroup tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

kernel/cgroup.c: In function 'cgroup_mount':
kernel/cgroup.c:1572:2: error: too few arguments to function 'kernfs_mount'
  dentry = kernfs_mount(fs_type, flags, root->kf_root);
  ^

Caused by commit 2bd59d48ebfb ("cgroup: convert to kernfs") interacting
with commit fed95bab8d29 ("sysfs: fix namespace refcnt leak") from the
driver-core.current tree.

I added the following merge fix patch, but it may not be completely
correct, please check.

From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Wed, 26 Feb 2014 17:41:51 +1100
Subject: [PATCH] cgroup: fix up for kernfs_mount API change

Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
---
 kernel/cgroup.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 306ad0ed19ef..8f4ddbe23d58 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -1569,7 +1569,7 @@ out_unlock:
 	if (ret)
 		return ERR_PTR(ret);
 
-	dentry = kernfs_mount(fs_type, flags, root->kf_root);
+	dentry = kernfs_mount(fs_type, flags, root->kf_root, NULL);
 	if (IS_ERR(dentry))
 		cgroup_put(&root->top_cgroup);
 	return dentry;
-- 
1.9.0

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

Content of type "application/pgp-signature" skipped