linux-next: build failure after merge of the userns tree

From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Eric W. Biederman" <ebiederm@xmission.com>,
	Al Viro <viro@zeniv.linux.org.uk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: linux-next: build failure after merge of the userns tree
Date: Fri, 8 Nov 2013 17:58:48 +1100	[thread overview]
Message-ID: <20131108175848.6ca49f0ee8fe2a6c1125394a@canb.auug.org.au> (raw)

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

Hi Eric,

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

fs/namei.c: In function 'covered':
fs/namei.c:3528:2: error: too many arguments to function '__lookup_mnt'
  is_covered = d_mountpoint(dentry) && __lookup_mnt(mnt, dentry, 1);
  ^

Caused by my incomplete merge resolution between commits 474279dc0f77
("split __lookup_mnt() in two functions") from the vfs tree and
a3b4491433f2 ("vfs: Don't allow overwriting mounts in the current mount
namespace") from the userns tree.

I added the following fix up patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 8 Nov 2013 17:56:35 +1100
Subject: [PATCH] vfs: merge fixup for __lookup_mnt() API change

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

diff --git a/fs/namei.c b/fs/namei.c
index 83463500c582..03d999bf9a89 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -3525,7 +3525,7 @@ static bool covered(struct vfsmount *mnt, struct dentry *dentry)
 	bool is_covered;
 
 	rcu_read_lock();
-	is_covered = d_mountpoint(dentry) && __lookup_mnt(mnt, dentry, 1);
+	is_covered = d_mountpoint(dentry) && __lookup_mnt(mnt, dentry);
 	rcu_read_unlock();
 
 	return is_covered;
-- 
1.8.4.2

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

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