Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Subject: Re: [PATCH] NFS: Fix missing unlock in nfs_unlink()
To:     <trond.myklebust@hammerspace.com>, <anna@kernel.org>
CC:     <linux-nfs@vger.kernel.org>, <kernel-janitors@vger.kernel.org>,
        <neilb@suse.de>
References: <20220812011440.3602849-1-sunke32@huawei.com>
From:   Sun Ke <sunke32@huawei.com>
Message-ID: <5e947976-0808-1d32-e170-d85ef73972e7@huawei.com>
Date:   Tue, 16 Aug 2022 09:06:06 +0800
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101
 Thunderbird/78.6.1
MIME-Version: 1.0
In-Reply-To: <20220812011440.3602849-1-sunke32@huawei.com>
Content-Type: text/plain; charset="gbk"; format=flowed
Content-Transfer-Encoding: 8bit
Precedence: bulk

friendly ping...

?? 2022/8/12 9:14, Sun Ke д??:
> Add the missing unlock before goto.
> 
> Fixes: 3c59366c207e ("NFS: don't unhash dentry during unlink/rename")
> Signed-off-by: Sun Ke <sunke32@huawei.com>
> ---
>   fs/nfs/dir.c | 4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
> index dbab3caa15ed..1b879584d4fe 100644
> --- a/fs/nfs/dir.c
> +++ b/fs/nfs/dir.c
> @@ -2484,8 +2484,10 @@ int nfs_unlink(struct inode *dir, struct dentry *dentry)
>   	 */
>   	error = -ETXTBSY;
>   	if (WARN_ON(dentry->d_flags & DCACHE_NFSFS_RENAMED) ||
> -	    WARN_ON(dentry->d_fsdata == NFS_FSDATA_BLOCKED))
> +	    WARN_ON(dentry->d_fsdata == NFS_FSDATA_BLOCKED)) {
> +		spin_unlock(&dentry->d_lock);
>   		goto out;
> +	}
>   	if (dentry->d_fsdata)
>   		/* old devname */
>   		kfree(dentry->d_fsdata);
>