From: Chuck Lever <chuck.lever@oracle.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jeff Layton <jlayton@kernel.org>,
Jeffrey Layton <jlayton@redhat.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
NeilBrown <neilb@suse.de>
Subject: Re: linux-next: manual merge of the nfsd tree with the nfsd-fixes tree
Date: Thu, 4 Jan 2024 22:51:07 -0500 [thread overview]
Message-ID: <ZZd8q4RSTTN/5wSq@tissot.1015granger.net> (raw)
In-Reply-To: <20240105110007.3f932561@canb.auug.org.au>
On Fri, Jan 05, 2024 at 11:00:07AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the nfsd tree got a conflict in:
>
> fs/nfsd/nfsctl.c
>
> between commit:
>
> 76d296a82657 ("nfsd: drop the nfsd_put helper")
>
> from the nfsd-fixes tree and commits:
>
> 3a0b966ab40f ("SUNRPC: discard sv_refcnt, and svc_get/svc_put")
> 9bf4b41b79a3 ("nfsd: rename nfsd_last_thread() to nfsd_destroy_serv()")
>
> from the nfsd tree.
Ugh.
I plan to rebase nfsd-next as soon as 76d296a82657 ("nfsd: drop the
nfsd_put helper") is merged. I'll have a closer look at this
conflict tomorrow (my time).
> I fixed it up (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/nfsctl.c
> index 87fed75808ff,cca1dd7b8c55..000000000000
> --- a/fs/nfsd/nfsctl.c
> +++ b/fs/nfsd/nfsctl.c
> @@@ -704,15 -707,12 +708,12 @@@ static ssize_t __write_ports_addfd(cha
> if (err != 0)
> return err;
>
> - err = svc_addsock(nn->nfsd_serv, net, fd, buf, SIMPLE_TRANSACTION_LIMIT, cred);
> + serv = nn->nfsd_serv;
> + err = svc_addsock(serv, net, fd, buf, SIMPLE_TRANSACTION_LIMIT, cred);
>
> - if (err < 0 && !serv->sv_nrthreads && !nn->keep_active)
> - nfsd_last_thread(net);
> - else if (err >= 0 && !serv->sv_nrthreads && !xchg(&nn->keep_active, 1))
> - svc_get(serv);
> - if (!nn->nfsd_serv->sv_nrthreads &&
> - list_empty(&nn->nfsd_serv->sv_permsocks))
> ++ if (!serv->sv_nrthreads && list_empty(&serv->sv_permsocks))
> + nfsd_destroy_serv(net);
>
> - svc_put(serv);
> return err;
> }
>
> @@@ -750,22 -748,18 +751,17 @@@ static ssize_t __write_ports_addxprt(ch
> if (err < 0 && err != -EAFNOSUPPORT)
> goto out_close;
>
> - if (!serv->sv_nrthreads && !xchg(&nn->keep_active, 1))
> - svc_get(serv);
> -
> - svc_put(serv);
> return 0;
> out_close:
> - xprt = svc_find_xprt(nn->nfsd_serv, transport, net, PF_INET, port);
> + xprt = svc_find_xprt(serv, transport, net, PF_INET, port);
> if (xprt != NULL) {
> svc_xprt_close(xprt);
> svc_xprt_put(xprt);
> }
> out_err:
> - if (!serv->sv_nrthreads && !nn->keep_active)
> - nfsd_last_thread(net);
> - if (!nn->nfsd_serv->sv_nrthreads &&
> - list_empty(&nn->nfsd_serv->sv_permsocks))
> ++ if (!serv->sv_nrthreads && list_empty(&serv->sv_permsocks))
> + nfsd_destroy_serv(net);
>
> - svc_put(serv);
> return err;
> }
>
--
Chuck Lever
next prev parent reply other threads:[~2024-01-05 3:51 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2024-01-05 22:33 ` Stephen Rothwell
2024-01-06 0:26 ` Chuck Lever III
2024-01-06 0:45 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2024-04-24 0:07 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=ZZd8q4RSTTN/5wSq@tissot.1015granger.net \
--to=chuck.lever@oracle.com \
--cc=jlayton@kernel.org \
--cc=jlayton@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=neilb@suse.de \
--cc=sfr@canb.auug.org.au \
/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).