From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Chuck Lever <chuck.lever@oracle.com>
Cc: Christian Brauner <brauner@kernel.org>,
Dai Ngo <dai.ngo@oracle.com>, Jeff Layton <jlayton@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 vfs-brauner tree
Date: Wed, 13 Mar 2024 10:41:58 +1100 [thread overview]
Message-ID: <20240313104158.5649190c@canb.auug.org.au> (raw)
In-Reply-To: <20240219104450.4d258995@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1875 bytes --]
Hi all,
On Mon, 19 Feb 2024 10:44:50 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the vfs-brauner tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> fs/nfsd/nfs4state.c: In function 'nfsd4_deleg_getattr_conflict':
> fs/nfsd/nfs4state.c:8845:32: error: 'struct file_lease' has no member named 'fl_owner'
> 8845 | dp = fl->fl_owner;
> | ^~
>
> Caused by commits
>
> a69ce85ec9af ("filelock: split common fields into struct file_lock_core")
> 282c30f320ba ("filelock: remove temporary compatibility macros")
>
> interacting with commit
>
> b9b89fb3e0b6 ("NFSD: handle GETATTR conflict with write delegation")
>
> from the nfsd tree.
>
> I have applied the following merge resolution patch.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 19 Feb 2024 10:38:26 +1100
> Subject: [PATCH] fixup for "filelock: split common fields into struct
> file_lock_core"
>
> interacting with "NFSD: handle GETATTR conflict with write delegation"
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> fs/nfsd/nfs4state.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
> index 3545125c8b73..71bb0ee57cf8 100644
> --- a/fs/nfsd/nfs4state.c
> +++ b/fs/nfsd/nfs4state.c
> @@ -8842,7 +8842,7 @@ nfsd4_deleg_getattr_conflict(struct svc_rqst *rqstp, struct inode *inode,
> }
> break_lease:
> nfsd_stats_wdeleg_getattr_inc(nn);
> - dp = fl->fl_owner;
> + dp = fl->c.flc_owner;
> ncf = &dp->dl_cb_fattr;
> nfs4_cb_getattr(&dp->dl_cb_fattr);
> spin_unlock(&ctx->flc_lock);
> --
> 2.43.0
This is now required in the merge of the nfsd tree with Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2024-03-12 23:42 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-18 23:44 linux-next: build failure after merge of the vfs-brauner tree Stephen Rothwell
2024-03-12 23:41 ` Stephen Rothwell [this message]
2024-03-12 23:45 ` Chuck Lever III
2024-03-13 3:10 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2024-04-04 2:24 Stephen Rothwell
2024-04-04 7:50 ` David Howells
2024-02-11 23:52 Stephen Rothwell
2024-02-12 0:36 ` Kent Overstreet
2024-01-23 1:52 Stephen Rothwell
2024-01-24 1:20 ` Stephen Rothwell
2024-01-24 11:13 ` Christian Brauner
2024-01-24 11:35 ` Stephen Rothwell
2024-01-25 16:21 ` Christian Brauner
2023-12-21 0:18 Stephen Rothwell
2023-12-21 1:32 ` Matthew Wilcox
2023-12-21 23:41 ` Stephen Rothwell
2023-10-31 1:07 Stephen Rothwell
2023-10-18 23:54 Stephen Rothwell
2023-10-19 9:17 ` Christian Brauner
2023-10-02 22:30 Stephen Rothwell
2023-10-03 13:24 ` Christian Brauner
2023-09-28 0:54 Stephen Rothwell
2023-10-02 11:21 ` Jan Kara
2023-10-02 11:26 ` Jan Kara
2023-10-02 21:24 ` Stephen Rothwell
2023-10-03 13:27 ` Kent Overstreet
2023-10-04 15:46 ` Jan Kara
2023-10-09 14:00 ` Christian Brauner
2023-09-28 0:39 Stephen Rothwell
2023-09-28 14:52 ` Christian Brauner
2023-08-03 0:03 Stephen Rothwell
2023-08-03 10:06 ` Jan Kara
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=20240313104158.5649190c@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=brauner@kernel.org \
--cc=chuck.lever@oracle.com \
--cc=dai.ngo@oracle.com \
--cc=jlayton@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).