From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Al Viro <viro@zeniv•linux.org.uk>
Cc: Daniel Borkmann <daniel@iogearbox•net>,
Alexei Starovoitov <ast@kernel•org>,
Andrii Nakryiko <andrii@kernel•org>,
Christian Brauner <brauner@kernel•org>, bpf <bpf@vger•kernel.org>,
Networking <netdev@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: build failure after merge of the bpf-next tree
Date: Wed, 14 Aug 2024 12:37:53 +1000 [thread overview]
Message-ID: <20240814123753.70dd1389@canb.auug.org.au> (raw)
In-Reply-To: <20240814014157.GM13701@ZenIV>
[-- 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 --]
next prev parent reply other threads:[~2024-08-14 2:37 UTC|newest]
Thread overview: 110+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-14 1:25 linux-next: build failure after merge of the bpf-next tree Stephen Rothwell
2024-08-14 1:41 ` Al Viro
2024-08-14 2:37 ` Stephen Rothwell [this message]
2024-08-14 14:50 ` Christian Brauner
2024-08-30 1:32 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2026-05-26 12:13 Mark Brown
2026-05-26 22:08 ` Alexei Starovoitov
2026-05-27 13:24 ` Mark Brown
2026-05-27 19:27 ` Tejun Heo
2026-04-27 13:26 Thierry Reding
2026-04-27 13:34 ` Thierry Reding
2026-04-27 13:43 ` Alan Maguire
2025-03-19 2:33 Stephen Rothwell
2025-03-19 2:46 ` Alexei Starovoitov
2025-03-19 3:28 ` Stephen Rothwell
2025-03-19 13:37 ` Kumar Kartikeya Dwivedi
2025-03-19 13:43 ` Kumar Kartikeya Dwivedi
2025-03-19 14:36 ` Kumar Kartikeya Dwivedi
2025-03-19 14:55 ` Alexei Starovoitov
2025-03-19 15:11 ` Alexei Starovoitov
2025-03-19 16:06 ` Uros Bizjak
2025-03-19 18:56 ` Alexei Starovoitov
2025-03-19 19:43 ` Uros Bizjak
2025-03-19 23:16 ` Alexei Starovoitov
2025-03-20 7:49 ` Uros Bizjak
2025-03-20 23:17 ` Alexei Starovoitov
2025-03-21 7:15 ` Uros Bizjak
2025-03-19 5:03 ` Uros Bizjak
2025-03-12 3:52 Stephen Rothwell
2024-10-16 6:05 Stephen Rothwell
2024-10-16 16:25 ` Alexei Starovoitov
2024-10-16 18:35 ` Namhyung Kim
2024-10-16 19:32 ` Alexei Starovoitov
2024-09-13 3:55 Stephen Rothwell
2024-09-13 4:00 ` Al Viro
2024-09-13 4:26 ` Andrii Nakryiko
2024-09-13 4:43 ` Al Viro
2024-09-15 23:30 ` Stephen Rothwell
2024-09-13 3:45 Stephen Rothwell
2024-09-13 3:48 ` Stephen Rothwell
2024-09-15 23:27 ` Stephen Rothwell
2024-09-13 3:32 Stephen Rothwell
2024-09-15 23:26 ` Stephen Rothwell
2024-08-14 1:18 Stephen Rothwell
2024-06-17 18:15 Mark Brown
2024-06-22 8:17 ` kernel test robot
2024-06-22 8:28 ` kernel test robot
2024-06-25 1:22 ` Thinker Li
2024-06-25 15:54 ` Benjamin Tissoires
2024-06-25 16:03 ` Mark Brown
2024-06-25 17:14 ` Alexei Starovoitov
2024-06-27 7:14 ` Benjamin Tissoires
2024-07-09 23:13 ` Stephen Rothwell
2024-07-18 1:49 ` Stephen Rothwell
2024-07-18 7:42 ` Benjamin Tissoires
2023-03-19 23:26 Stephen Rothwell
2023-03-20 12:07 ` Alexander Lobakin
2023-03-21 22:35 ` Stephen Rothwell
2022-07-20 1:59 Stephen Rothwell
2022-07-20 3:42 ` Alexei Starovoitov
2022-07-20 3:44 ` Stanislav Fomichev
2022-04-19 1:56 Stephen Rothwell
2022-04-21 0:32 ` Stephen Rothwell
2022-04-21 9:45 ` Daniel Borkmann
2022-04-21 10:40 ` Maciej Fijalkowski
2022-02-09 0:21 Stephen Rothwell
2021-12-03 0:15 Stephen Rothwell
2021-09-14 1:37 Stephen Rothwell
2021-09-14 23:25 ` Andrii Nakryiko
2021-09-14 23:38 ` Stephen Rothwell
2021-09-14 23:40 ` Andrii Nakryiko
2021-09-14 23:59 ` Stephen Rothwell
2021-09-15 1:27 ` Alexei Starovoitov
2021-08-26 1:50 Stephen Rothwell
2021-08-26 2:01 ` Daniel Xu
2021-03-11 0:47 Stephen Rothwell
2021-03-11 6:47 ` Björn Töpel
2021-03-12 1:00 ` Stephen Rothwell
2021-03-26 1:18 ` Stephen Rothwell
2020-12-01 8:07 Stephen Rothwell
2020-12-01 14:55 ` Daniel Borkmann
2020-09-08 3:08 Stephen Rothwell
2020-09-08 17:54 ` Andrii Nakryiko
2020-08-21 1:11 Stephen Rothwell
2020-08-25 1:20 ` Stephen Rothwell
2020-08-25 1:25 ` Alexei Starovoitov
2020-08-25 3:04 ` Stephen Rothwell
2020-08-25 3:27 ` Alexei Starovoitov
2020-08-25 6:50 ` Stephen Rothwell
2020-08-25 14:33 ` Alexei Starovoitov
2020-08-25 21:10 ` Stephen Rothwell
2020-08-25 22:34 ` Alexei Starovoitov
2020-08-25 23:09 ` Stephen Rothwell
2020-07-14 2:22 Stephen Rothwell
2020-07-14 6:16 ` Jiri Olsa
2020-07-14 8:31 ` Jiri Olsa
2020-07-14 9:19 ` Geert Uytterhoeven
2019-07-01 4:57 Stephen Rothwell
2019-07-01 5:01 ` Stephen Rothwell
2019-04-18 1:57 Stephen Rothwell
2019-02-28 1:31 Stephen Rothwell
2019-02-28 2:18 ` Alexei Starovoitov
2018-10-03 3:18 Stephen Rothwell
2018-10-03 5:29 ` Joe Stringer
2018-09-07 0:19 Stephen Rothwell
2018-09-07 0:22 ` Alexei Starovoitov
2018-09-07 5:21 ` Björn Töpel
2018-09-07 5:45 ` Alexei Starovoitov
2017-12-13 1:32 Stephen Rothwell
2017-12-13 1:47 ` Alexei Starovoitov
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=20240814123753.70dd1389@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=andrii@kernel$(echo .)org \
--cc=ast@kernel$(echo .)org \
--cc=bpf@vger$(echo .)kernel.org \
--cc=brauner@kernel$(echo .)org \
--cc=daniel@iogearbox$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=viro@zeniv$(echo .)linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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