Hi all,
After merging the bpf-next tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
fs/namespace.c: In function 'grab_requested_mnt_ns':
fs/namespace.c:5295:23: error: 'class_fd_t' {aka 'struct fd'} has no member named 'file'
5295 | if (!f.file)
| ^
fs/namespace.c:5298:36: error: 'class_fd_t' {aka 'struct fd'} has no member named 'file'
5298 | if (!proc_ns_file(f.file))
| ^
In file included from fs/namespace.c:25:
fs/namespace.c:5301:46: error: 'class_fd_t' {aka 'struct fd'} has no member named 'file'
5301 | ns = get_proc_ns(file_inode(f.file));
| ^
include/linux/proc_ns.h:75:50: note: in definition of macro 'get_proc_ns'
75 | #define get_proc_ns(inode) ((struct ns_common *)(inode)->i_private)
| ^~~~~
Caused by commit
1da91ea87aef ("introduce fd_file(), convert all accessors to it.")
interacting with commit
7b9d14af8777 ("fs: allow mount namespace fd")
from the vfs-brauner tree.
I applied the following merge fix patch:
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Wed, 14 Aug 2024 11:07:38 +1000
Subject: [PATCH] fixup for "introduce fd_file(), convert all accessors to it."
interacting with "fs: allow mount namespace fd" from hte vfs-brauner tree.
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
fs/namespace.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/fs/namespace.c b/fs/namespace.c
index 159be8ed9d24..7aed325c48ad 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -5292,13 +5292,13 @@ static struct mnt_namespace *grab_requested_mnt_ns(const struct mnt_id_req *kreq
struct ns_common *ns;
CLASS(fd, f)(kreq->spare);
- if (!f.file)
+ if (!fd_file(f))
return ERR_PTR(-EBADF);
- if (!proc_ns_file(f.file))
+ if (!proc_ns_file(fd_file(f)))
return ERR_PTR(-EINVAL);
- ns = get_proc_ns(file_inode(f.file));
+ ns = get_proc_ns(file_inode(fd_file(f)));
if (ns->ops->type != CLONE_NEWNS)
return ERR_PTR(-EINVAL);
--
2.43.0
--
Cheers,
Stephen Rothwell
Attachment:
pgpXtgBU8Z4GW.pgp
Description: OpenPGP digital signature
