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
Date: Wed, 24 Apr 2024 10:07:49 +1000 [thread overview]
Message-ID: <20240424100749.50722ad3@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1906 bytes --]
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)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-04-24 0:07 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-24 0:07 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-01-05 0:00 linux-next: manual merge of the nfsd tree with the nfsd-fixes tree Stephen Rothwell
2024-01-05 3:51 ` Chuck Lever
2024-01-05 22:33 ` Stephen Rothwell
2024-01-06 0:26 ` Chuck Lever III
2024-01-06 0:45 ` Stephen Rothwell
2023-08-15 1:06 Stephen Rothwell
2023-08-15 13:49 ` Chuck Lever
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=20240424100749.50722ad3@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=chuck.lever@oracle.com \
--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 read-only IMAP folder(s) and NNTP newsgroup(s).