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 --]
next reply other threads:[~2013-11-08 6:59 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-08 6:58 Stephen Rothwell [this message]
2013-11-08 7:27 ` linux-next: build failure after merge of the userns tree Christoph Hellwig
2013-11-08 15:55 ` Al Viro
2013-11-08 22:50 ` Eric W. Biederman
2013-11-09 8:32 ` Christoph Hellwig
-- strict thread matches above, loose matches on Subject: below --
2022-03-16 5:56 Stephen Rothwell
2022-03-16 13:54 ` Eric W. Biederman
2021-12-17 7:34 Stephen Rothwell
2021-12-17 16:53 ` Eric W. Biederman
2021-12-17 7:13 Stephen Rothwell
2021-10-20 3:46 Stephen Rothwell
2021-10-20 16:00 ` Eric W. Biederman
2021-10-07 3:47 Stephen Rothwell
2021-10-07 18:56 ` Eric W. Biederman
2020-05-21 8:22 Stephen Rothwell
2018-03-28 7:41 Stephen Rothwell
2018-03-28 18:32 ` Eric W. Biederman
2018-01-26 1:05 Stephen Rothwell
2018-01-26 2:45 ` Eric W. Biederman
2017-07-20 3:25 Stephen Rothwell
2017-07-20 12:17 ` Eric W. Biederman
2015-05-25 10:39 Stephen Rothwell
2014-04-17 5:12 Stephen Rothwell
2014-04-17 7:18 ` Eric W. Biederman
2014-04-22 1:34 ` Stephen Rothwell
2013-11-08 7:07 Stephen Rothwell
2013-11-08 23:15 ` Eric W. Biederman
2013-11-11 5:25 ` Stephen Rothwell
2012-09-24 12:18 Stephen Rothwell
2012-05-21 7:50 Stephen Rothwell
2012-05-21 22:05 ` Eric W. Biederman
2012-05-14 9:13 Stephen Rothwell
2012-05-16 1:12 ` Eric W. Biederman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20131108175848.6ca49f0ee8fe2a6c1125394a@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=ebiederm@xmission.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).