From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Chuck Lever <chuck.lever@oracle•com>
Cc: Christian Brauner <brauner@kernel•org>,
Jeff Layton <jlayton@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
NeilBrown <neil@brown•name>, NeilBrown <neilb@ownmail•net>
Subject: Re: linux-next: manual merge of the vfs-brauner tree with the nfsd tree
Date: Wed, 3 Dec 2025 10:11:08 +1100 [thread overview]
Message-ID: <20251203101108.02f419d7@canb.auug.org.au> (raw)
In-Reply-To: <20251117073452.2c9b0190@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2863 bytes --]
Hi all,
On Mon, 17 Nov 2025 07:34:52 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the vfs-brauner tree got a conflict in:
>
> fs/nfsd/nfs4recover.c
>
> between commit:
>
> 8a25e05a98ab ("nfsd: move name lookup out of nfsd4_list_rec_dir()")
>
> from the nfsd tree and commit:
>
> 4fa76319cd0c ("vfs: allow rmdir to wait for delegation break on parent")
>
> from the vfs-brauner tree.
>
> 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.
>
>
> diff --cc fs/nfsd/nfs4recover.c
> index b1005abcb903,1f031e5af5b2..000000000000
> --- a/fs/nfsd/nfs4recover.c
> +++ b/fs/nfsd/nfs4recover.c
> @@@ -201,18 -210,17 +199,16 @@@ nfsd4_create_clid_dir(struct nfs4_clien
> * In the 4.0 case, we should never get here; but we may
> * as well be forgiving and just succeed silently.
> */
> - goto out_put;
> - dentry = vfs_mkdir(&nop_mnt_idmap, d_inode(dir), dentry, S_IRWXU);
> + goto out_end;
> + dentry = vfs_mkdir(&nop_mnt_idmap, d_inode(dir), dentry, S_IRWXU, NULL);
> if (IS_ERR(dentry))
> status = PTR_ERR(dentry);
> - out_put:
> - if (!status)
> - dput(dentry);
> - out_unlock:
> - inode_unlock(d_inode(dir));
> + out_end:
> + end_creating(dentry);
> + out:
> if (status == 0) {
> if (nn->in_grace)
> - __nfsd4_create_reclaim_record_grace(clp, dname,
> - HEXDIR_LEN, nn);
> + __nfsd4_create_reclaim_record_grace(clp, dname, nn);
> vfs_fsync(nn->rec_file, 0);
> } else {
> printk(KERN_ERR "NFSD: failed to write recovery record"
> @@@ -406,17 -415,10 +394,17 @@@ purge_old(struct dentry *parent, char *
> if (nfs4_has_reclaimed_state(name, nn))
> goto out_free;
>
> - status = vfs_rmdir(&nop_mnt_idmap, d_inode(parent), child, NULL);
> - if (status)
> - printk("failed to remove client recovery directory %pd\n",
> - child);
> + inode_lock_nested(d_inode(parent), I_MUTEX_PARENT);
> + child = lookup_one(&nop_mnt_idmap, &QSTR(cname), parent);
> + if (!IS_ERR(child)) {
> - status = vfs_rmdir(&nop_mnt_idmap, d_inode(parent), child);
> ++ status = vfs_rmdir(&nop_mnt_idmap, d_inode(parent), child, NULL);
> + if (status)
> + printk("failed to remove client recovery directory %pd\n",
> + child);
> + dput(child);
> + }
> + inode_unlock(d_inode(parent));
> +
> out_free:
> kfree(name.data);
> out:
This is now a conflict between the nfsd tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2025-12-02 23:11 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-16 20:34 linux-next: manual merge of the vfs-brauner tree with the nfsd tree Stephen Rothwell
2025-12-02 23:11 ` Stephen Rothwell [this message]
-- 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
2024-10-23 21:15 Stephen Rothwell
2024-02-07 0:41 Stephen Rothwell
2024-02-07 14:40 ` Chuck Lever
2024-02-07 14:58 ` Jeff Layton
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=20251203101108.02f419d7@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=brauner@kernel$(echo .)org \
--cc=chuck.lever@oracle$(echo .)com \
--cc=jlayton@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=neil@brown$(echo .)name \
--cc=neilb@ownmail$(echo .)net \
/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