2022-08-12 01:06:05

by Sun Ke

Subject: [PATCH] NFS: Fix missing unlock in nfs_unlink()

Add the missing unlock before goto.

Fixes: 3c59366c207e ("NFS: don't unhash dentry during unlink/rename")
Signed-off-by: Sun Ke <[email protected]>
---
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);
--
2.31.1

2022-08-16 04:31:07

by Sun Ke

Subject: Re: [PATCH] NFS: Fix missing unlock in nfs_unlink()

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 <[email protected]>
> ---
> 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);
>

2022-08-16 10:27:09

by Dan Carpenter

Subject: Re: [PATCH] NFS: Fix missing unlock in nfs_unlink()

On Tue, Aug 16, 2022 at 09:06:06AM +0800, Sun Ke wrote:
> friendly ping...
>
> 在 2022/8/12 9:14, Sun Ke 写道:
> > Add the missing unlock before goto.


The patch is correct, but please wait at least two weeks before sending
reminders. Longer than two weeks if the merge window is open.

regards,
dan carpenter

2022-08-17 02:04:08

by Sun Ke

Subject: Re: [PATCH] NFS: Fix missing unlock in nfs_unlink()

在 2022/8/16 16:28, Dan Carpenter 写道:
> On Tue, Aug 16, 2022 at 09:06:06AM +0800, Sun Ke wrote:
>> friendly ping...
>>
>> 在 2022/8/12 9:14, Sun Ke 写道:
>>> Add the missing unlock before goto.
>
>
> The patch is correct, but please wait at least two weeks before sending
> reminders. Longer than two weeks if the merge window is open.

Sorry for that, two weeks, got it. By the way, I find the patch have
merged to next.

Thanks.
Sun Ke
>
> regards,
> dan carpenter
>
> .
>