Received-SPF: pass (google.com: domain of linux-kernel+bounces-156043-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Date: Wed, 24 Apr 2024 10:07:49 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Chuck Lever <chuck.lever@oracle.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next
 Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the nfsd tree with the nfsd-fixes tree
Message-ID: <20240424100749.50722ad3@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/n8.4Y1ZhBV_UkaQ.o/Oq/YE";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/n8.4Y1ZhBV_UkaQ.o/Oq/YE
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the nfsd tree got a conflict in:

  fs/nfsd/nfs4callback.c

between commits:

  173936c54b8f ("Revert "NFSD: Reschedule CB operations when backchannel rp=
c_clnt is shut down"")
  7d32b207859f ("Revert "NFSD: Convert the callback workqueue to use delaye=
d_work"")

from the nfsd-fixes tree and commit:

  7c33236d7e12 ("NFSD: Move callback_wq into struct nfs4_client")

from the nfsd tree.

I fixed it up (I think - see below) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.

--=20
Cheers,
Stephen Rothwell

diff --cc fs/nfsd/nfs4callback.c
index e88aca0c6e8e,cf87ace7a1b0..000000000000
--- a/fs/nfsd/nfs4callback.c
+++ b/fs/nfsd/nfs4callback.c
@@@ -978,12 -978,22 +978,12 @@@ static int max_cb_time(struct net *net
  	return max(((u32)nn->nfsd4_lease)/10, 1u) * HZ;
  }
 =20
- static struct workqueue_struct *callback_wq;
-=20
  static bool nfsd4_queue_cb(struct nfsd4_callback *cb)
  {
- 	trace_nfsd_cb_queue(cb->cb_clp, cb);
- 	return queue_work(callback_wq, &cb->cb_work);
+ 	struct nfs4_client *clp =3D cb->cb_clp;
+=20
+ 	trace_nfsd_cb_queue(clp, cb);
 -	return queue_delayed_work(clp->cl_callback_wq, &cb->cb_work, 0);
 -}
 -
 -static void nfsd4_queue_cb_delayed(struct nfsd4_callback *cb,
 -				   unsigned long msecs)
 -{
 -	struct nfs4_client *clp =3D cb->cb_clp;
 -
 -	trace_nfsd_cb_queue(clp, cb);
 -	queue_delayed_work(clp->cl_callback_wq, &cb->cb_work,
 -			   msecs_to_jiffies(msecs));
++	return queue_work(clp->cl_callback_wq, &cb->cb_work);
  }
 =20
  static void nfsd41_cb_inflight_begin(struct nfs4_client *clp)

--Sig_/n8.4Y1ZhBV_UkaQ.o/Oq/YE
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmYoTVUACgkQAVBC80lX
0Gxktwf+M9xXo2AibnbLX3JlhH0PCZ3RcyXamAiSik9Hvpkh+K6h95YpRjR5xK/2
MahA8HTV9XTz6Z8kL4Kg0GbJQTEmeActsMLS2miJVB/BhMJgieVxI9ygx4f/Wf0T
RFIchQW9uCmykodBPqltxECxcM1tlNJdA8KUiv2NszGjCIuZySlBt1Q5Jsj0xuIz
SYg+oaOa/Gl7vfjite/20vViaCDTVoVHiMQj4sIKzgcFutMPxW7e9EjDqHgDbe6g
GYPyUCPh5a3639939GGDrsX0uyUkdGrKaMXkVQr0ASxaywQ/7w1ZS2OaclL0hvmu
2gdnALQ3MNzLJ14k4efBRvnhtC9kQQ==
=QMsX
-----END PGP SIGNATURE-----

--Sig_/n8.4Y1ZhBV_UkaQ.o/Oq/YE--