Re: linux-next: build failure after merge of the bpf-next tree

Stephen Rothwell
2024-08-14T02:37:56Z

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

Hi Al,

On Wed, 14 Aug 2024 02:41:57 +0100 Al Viro <viro@zeniv.linux.org.uk> wrote:
>
> On Wed, Aug 14, 2024 at 11:25:04AM +1000, Stephen Rothwell wrote:
> > if (at_flags & AT_EMPTY_PATH && vfs_empty_path(dfd, pathname)) {
> > CLASS(fd, f)(dfd);
> > - if (!f.file)
> > + if (!fd_file(f))
>
> if (fd_empty(f))
>
> actually, and similar for the rest of it. Anyway, that'll need to be
> sorted out in vfs/vfs.git; sorry about the delay.

So from tomorrow, the two merge resolution patches will be these:

rom: Stephen Rothwell <sfr@canb.auug.org.au>
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 the vfs-brauner tree.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
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_empty(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

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 14 Aug 2024 11:20:43 +1000
Subject: [PATCH] fixup2 for "introduce fd_file(), convert all accessors to it."

interacting with

1a61c9d6ec1d ("xattr: handle AT_EMPTY_PATH when setting xattrs")
278397b2c592 ("xattr: handle AT_EMPTY_PATH when getting xattrs")
5560ab7ee32e ("xattr: handle AT_EMPTY_PATH when listing xattrs")
33fce6444e7d ("xattr: handle AT_EMPTY_PATH when removing xattrs")

from the vfs-brauner tree.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
fs/xattr.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/fs/xattr.c b/fs/xattr.c
index fa992953fa78..c0ecd0809172 100644
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -829,10 +829,10 @@ static ssize_t path_getxattrat(int dfd, const char __user *pathname,

if (at_flags & AT_EMPTY_PATH && vfs_empty_path(dfd, pathname)) {
CLASS(fd, f)(dfd);
- if (!f.file)
+ if (fd_empty(f))
return -EBADF;
- audit_file(f.file);
- return getxattr(file_mnt_idmap(f.file), file_dentry(f.file),
+ audit_file(fd_file(f));
+ return getxattr(file_mnt_idmap(fd_file(f)), file_dentry(fd_file(f)),
name, value, size);
}

@@ -949,10 +949,10 @@ static ssize_t path_listxattrat(int dfd, const char __user *pathname,

if (at_flags & AT_EMPTY_PATH && vfs_empty_path(dfd, pathname)) {
CLASS(fd, f)(dfd);
- if (!f.file)
+ if (fd_empty(f))
return -EBADF;
- audit_file(f.file);
- return listxattr(file_dentry(f.file), list, size);
+ audit_file(fd_file(f));
+ return listxattr(file_dentry(fd_file(f)), list, size);
}

lookup_flags = (at_flags & AT_SYMLINK_NOFOLLOW) ? 0 : LOOKUP_FOLLOW;
@@ -1018,9 +1018,9 @@ static int do_fremovexattr(int fd, const char __user *name)
int error = -EBADF;

CLASS(fd, f)(fd);
- if (!f.file)
+ if (fd_empty(f))
return error;
- audit_file(f.file);
+ audit_file(fd_file(f));

error = strncpy_from_user(kname, name, sizeof(kname));
if (error == 0 || error == sizeof(kname))
@@ -1028,11 +1028,11 @@ static int do_fremovexattr(int fd, const char __user *name)
if (error < 0)
return error;

- error = mnt_want_write_file(f.file);
+ error = mnt_want_write_file(fd_file(f));
if (!error) {
- error = removexattr(file_mnt_idmap(f.file),
- f.file->f_path.dentry, kname);
- mnt_drop_write_file(f.file);
+ error = removexattr(file_mnt_idmap(fd_file(f)),
+ fd_file(f)->f_path.dentry, kname);
+ mnt_drop_write_file(fd_file(f));
}
return error;
}
--
2.43.0

--
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]