From: Chuck Lever <chuck.lever@oracle•com>
To: Christian Brauner <brauner@kernel•org>, Jeff Layton <jlayton@kernel•org>
Cc: 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 vfs-brauner tree with the nfsd tree
Date: Wed, 7 Feb 2024 09:40:14 -0500 [thread overview]
Message-ID: <ZcOWTkR+pbQpFwvP@tissot.1015granger.net> (raw)
In-Reply-To: <20240207114118.23541d8c@canb.auug.org.au>
On Wed, Feb 07, 2024 at 11:41:18AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the vfs-brauner tree got a conflict in:
>
> fs/nfsd/nfs4layouts.c
>
> between commit:
>
> b1f1961080c4 ("nfsd: allow layout state to be admin-revoked.")
>
> from the nfsd tree and commit:
>
> 7b8001013d72 ("filelock: don't do security checks on nfsd setlease calls")
>
> from the vfs-brauner tree.
Christian, Jeff -
For the remaining duration of v6.9 development, should I rebase
nfsd-next on vfs-brauner ?
> 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/nfs4layouts.c
> index b1e585c1d9a3,4c0d00bdfbb1..4f3072b5979a
> --- a/fs/nfsd/nfs4layouts.c
> +++ b/fs/nfsd/nfs4layouts.c
> @@@ -152,23 -152,6 +152,23 @@@ void nfsd4_setup_layout_type(struct svc
> #endif
> }
>
> +void nfsd4_close_layout(struct nfs4_layout_stateid *ls)
> +{
> + struct nfsd_file *fl;
> +
> + spin_lock(&ls->ls_stid.sc_file->fi_lock);
> + fl = ls->ls_file;
> + ls->ls_file = NULL;
> + spin_unlock(&ls->ls_stid.sc_file->fi_lock);
> +
> + if (fl) {
> + if (!nfsd4_layout_ops[ls->ls_layout_type]->disable_recalls)
> - vfs_setlease(fl->nf_file, F_UNLCK, NULL,
> - (void **)&ls);
> ++ kernel_setlease(fl->nf_file, F_UNLCK, NULL,
> ++ (void **)&ls);
> + nfsd_file_put(fl);
> + }
> +}
> +
> static void
> nfsd4_free_layout_stateid(struct nfs4_stid *stid)
> {
--
Chuck Lever
next prev parent reply other threads:[~2024-02-07 14:40 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-07 0:41 linux-next: manual merge of the vfs-brauner tree with the nfsd tree Stephen Rothwell
2024-02-07 14:40 ` Chuck Lever [this message]
2024-02-07 14:58 ` Jeff Layton
-- strict thread matches above, loose matches on Subject: below --
2026-05-28 14:28 Mark Brown
2026-05-28 14:51 ` Chuck Lever
2026-05-28 15:01 ` Mark Brown
2026-05-28 15:34 ` Chuck Lever
2025-11-16 20:34 Stephen Rothwell
2025-12-02 23:11 ` Stephen Rothwell
2024-10-23 21:15 Stephen Rothwell
2023-05-23 23:56 Stephen Rothwell
2023-05-24 9:08 ` Christian Brauner
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=ZcOWTkR+pbQpFwvP@tissot.1015granger.net \
--to=chuck.lever@oracle$(echo .)com \
--cc=brauner@kernel$(echo .)org \
--cc=jlayton@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=neilb@suse$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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