Hi all,
On Fri, 13 Sep 2024 13:55:51 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> After merging the bpf-next tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> fs/xfs/xfs_exchrange.c: In function 'xfs_ioc_commit_range':
> fs/xfs/xfs_exchrange.c:938:19: error: 'struct fd' has no member named 'file'
> 938 | if (!file1.file)
> | ^
> fs/xfs/xfs_exchrange.c:940:26: error: 'struct fd' has no member named 'file'
> 940 | fxr.file1 = file1.file;
> | ^
>
> Caused by commit
>
> 1da91ea87aef ("introduce fd_file(), convert all accessors to it.")
>
> interacting with commit
>
> 398597c3ef7f ("xfs: introduce new file range commit ioctls")
>
> I have applied the following patch for today.
>
> From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> Date: Fri, 13 Sep 2024 13:53:35 +1000
> Subject: [PATCH] fix up 3 for "introduce fd_file(), convert all accessors to
> it."
>
> interacting with commit "xfs: introduce new file range commit ioctls"
> from the xfs tree.
>
> Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> ---
> fs/xfs/xfs_exchrange.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/xfs/xfs_exchrange.c b/fs/xfs/xfs_exchrange.c
> index 39fe02a8deac..75cb53f090d1 100644
> --- a/fs/xfs/xfs_exchrange.c
> +++ b/fs/xfs/xfs_exchrange.c
> @@ -935,9 +935,9 @@ xfs_ioc_commit_range(
> fxr.file2_ctime.tv_nsec = kern_f->file2_ctime_nsec;
>
> file1 = fdget(args.file1_fd);
> - if (!file1.file)
> + if (fd_empty(file1))
> return -EBADF;
> - fxr.file1 = file1.file;
> + fxr.file1 = fd_file(file1);
>
> error = xfs_exchange_range(&fxr);
> fdput(file1);
> --
> 2.45.2
This is now required in the merge of the vfs tree.
--
Cheers,
Stephen Rothwell
Attachment:
pgp8dPwZpka8r.pgp
Description: OpenPGP digital signature
