Received-SPF: pass (google.com: domain of linux-kernel+bounces-70624-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Date: Mon, 19 Feb 2024 10:44:50 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Christian Brauner <brauner@kernel.org>
Cc: Chuck Lever <chuck.lever@oracle.com>, 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: linux-next: build failure after merge of the vfs-brauner tree
Message-ID: <20240219104450.4d258995@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/1Cq8K.VyR_cYtpA2rtC1AAV";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/1Cq8K.VyR_cYtpA2rtC1AAV
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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 =3D 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 =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

--=20
Cheers,
Stephen Rothwell

--Sig_/1Cq8K.VyR_cYtpA2rtC1AAV
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXSlnIACgkQAVBC80lX
0GwNGAf/Rwy5pN54PVBC7Npq/Yn+Sp60o4LwqP/7EvqgbU4QW8Di0G76K4iLOnAN
o0Mhrfkir35BE43xhN794Ugj9wniGzBVS6denihoF2zdD22WI4D53EluPSa5ivSH
oKt6IPwe6P+JXj+Pueuz7ihyI+V6dAwsUSKVKhAn6vTrylaJ9QRQgtOAUGEuvA9n
E3+Omo4LMjn7zhOY4VQPu8J7Hx3nA+DtcxqkQUaU7b6N3ZmBZMhoX9VEl1Dj/Gp1
DeEF1MX/dEvfE3z8SclZyiXZdQSr9UAZtPYeDj4CfY92WT0AfobBVgb+LIhvGCk3
eHhjM+v229GK/usHXNGh9G9c9bO4Pw==
=WMsd
-----END PGP SIGNATURE-----

--Sig_/1Cq8K.VyR_cYtpA2rtC1AAV--