Hi all,
After merging the bpf-next tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
fs/xattr.c: In function 'path_getxattrat':
fs/xattr.c:832:23: error: 'class_fd_t' {aka 'struct fd'} has no member named 'file'
832 | if (!f.file)
| ^
fs/xattr.c:834:29: error: 'class_fd_t' {aka 'struct fd'} has no member named 'file'
834 | audit_file(f.file);
| ^
fs/xattr.c:835:49: error: 'class_fd_t' {aka 'struct fd'} has no member named 'file'
835 | return getxattr(file_mnt_idmap(f.file), file_dentry(f.file),
| ^
fs/xattr.c:835:70: error: 'class_fd_t' {aka 'struct fd'} has no member named 'file'
835 | return getxattr(file_mnt_idmap(f.file), file_dentry(f.file),
| ^
fs/xattr.c: In function 'path_listxattrat':
fs/xattr.c:952:23: error: 'class_fd_t' {aka 'struct fd'} has no member named 'file'
952 | if (!f.file)
| ^
fs/xattr.c:954:29: error: 'class_fd_t' {aka 'struct fd'} has no member named 'file'
954 | audit_file(f.file);
| ^
fs/xattr.c:955:47: error: 'class_fd_t' {aka 'struct fd'} has no member named 'file'
955 | return listxattr(file_dentry(f.file), list, size);
| ^
fs/xattr.c: In function 'do_fremovexattr':
fs/xattr.c:1021:15: error: 'class_fd_t' {aka 'struct fd'} has no member named 'file'
1021 | if (!f.file)
| ^
fs/xattr.c:1023:21: error: 'class_fd_t' {aka 'struct fd'} has no member named 'file'
1023 | audit_file(f.file);
| ^
fs/xattr.c:1031:38: error: 'class_fd_t' {aka 'struct fd'} has no member named 'file'
1031 | error = mnt_want_write_file(f.file);
| ^
fs/xattr.c:1033:53: error: 'class_fd_t' {aka 'struct fd'} has no member named 'file'
1033 | error = removexattr(file_mnt_idmap(f.file),
| ^
fs/xattr.c:1034:38: error: 'class_fd_t' {aka 'struct fd'} has no member named 'file'
1034 | f.file->f_path.dentry, kname);
| ^
fs/xattr.c:1035:38: error: 'class_fd_t' {aka 'struct fd'} has no member named 'file'
1035 | mnt_drop_write_file(f.file);
| ^
Caused by commit
1da91ea87aef ("introduce fd_file(), convert all accessors to it.")
interacting with commits
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.
I applied the following merge fix patch:
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxxxx>
---
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_file(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_file(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_file(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:
pgpzrZ6K1g2Ms.pgp
Description: OpenPGP digital signature
