Subject: linux-next: manual merge of the nfsd tree with the nfsd-fixes tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 24 Apr 2024 10:07:49 +1000

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 rpc_clnt is shut down"")
  7d32b207859f ("Revert "NFSD: Convert the callback workqueue to use delayed_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.

-- 
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;
  }
  
- static struct workqueue_struct *callback_wq;
- 
  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 = cb->cb_clp;
+ 
+ 	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 = 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);
  }
  
  static void nfsd41_cb_inflight_begin(struct nfs4_client *clp)