On Wed, 2026-02-04 at 15:57 +1100, NeilBrown wrote:
> From: NeilBrown <neil@brown.name>
>
> Rather than explicit locking, use the start_removing_noperm() and
> end_removing() wrappers.
> This was not done with other start_removing changes due to conflicting
> in-flight patches.
>
> Signed-off-by: NeilBrown <neil@brown.name>
> ---
> fs/nfsd/nfs4recover.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c
> index 441dfbfe2d2b..52fbe723a3c8 100644
> --- a/fs/nfsd/nfs4recover.c
> +++ b/fs/nfsd/nfs4recover.c
> @@ -351,16 +351,14 @@ purge_old(struct dentry *parent, char *cname, struct nfsd_net *nn)
> if (nfs4_has_reclaimed_state(name, nn))
> goto out_free;
>
> - inode_lock_nested(d_inode(parent), I_MUTEX_PARENT);
> - child = lookup_one(&nop_mnt_idmap, &QSTR(cname), parent);
> + child = start_removing_noperm(parent, &QSTR(cname));
> if (!IS_ERR(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));
> + end_removing(child);
>
> out_free:
> kfree(name.data);
Reviewed-by: Jeff Layton <jlayton@kernel.org>