Received-SPF: pass (google.com: domain of linux-kernel+bounces-100926-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Date: Wed, 13 Mar 2024 10:41:58 +1100
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
Message-ID: <20240313104158.5649190c@canb.auug.org.au>
In-Reply-To: <20240219104450.4d258995@canb.auug.org.au>
References: <20240219104450.4d258995@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Zd.4RUrtd4Rx6L=dpQzjrfL";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/Zd.4RUrtd4Rx6L=dpQzjrfL
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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:
>=20
> fs/nfsd/nfs4state.c: In function 'nfsd4_deleg_getattr_conflict':
> fs/nfsd/nfs4state.c:8845:32: error: 'struct file_lease' has no member nam=
ed 'fl_owner'
>  8845 |                         dp =3D fl->fl_owner;
>       |                                ^~
>=20
> Caused by commits
>=20
>   a69ce85ec9af ("filelock: split common fields into struct file_lock_core=
")
>   282c30f320ba ("filelock: remove temporary compatibility macros")
>=20
> interacting with commit
>=20
>   b9b89fb3e0b6 ("NFSD: handle GETATTR conflict with write delegation")
>=20
> from the nfsd tree.
>=20
> I have applied the following merge resolution patch.
>=20
> 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"
>=20
> interacting with "NFSD: handle GETATTR conflict with write delegation"
>=20
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  fs/nfsd/nfs4state.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>=20
> 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 =3D fl->fl_owner;
> +			dp =3D fl->c.flc_owner;
>  			ncf =3D &dp->dl_cb_fattr;
>  			nfs4_cb_getattr(&dp->dl_cb_fattr);
>  			spin_unlock(&ctx->flc_lock);
> --=20
> 2.43.0

This is now required in the merge of the nfsd tree with Linus' tree.

--=20
Cheers,
Stephen Rothwell

--Sig_/Zd.4RUrtd4Rx6L=dpQzjrfL
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXw6EYACgkQAVBC80lX
0GxuEQgAmwdzCg+Z+okkA3vPask4kdQH2VbxyPkHgZcdng66p4LFz88T0OOpbz2x
skOW9PnMKUVVd9hUTM/YknEWbaUZgxEWFhn7Z1M5xLv9bSVByJOBYxoXNwPT6cBt
O4hphar7sDhNhrzLFv5D0jYYMNVtHKhN6d4+4Xu67ypS5jNnpTne5cEWixn9wqD1
z4BG/D6KdFA02u8Cv2ZejqweGW0v9plMKkgJW8yS3cNixQiK7lcfNj157oEGcX38
uG0yBwq4pO54xa1Upvxt93ELooe0DvlsOJ9Vk1CtekgBmLedOSDoQAz9QDw8AcNX
83j7AUmjy5Jfwcbs3sV4w0DID8YiVg==
=zFGI
-----END PGP SIGNATURE-----

--Sig_/Zd.4RUrtd4Rx6L=dpQzjrfL--