2006-10-31 13:21:41

by Srinivasa Ds

[permalink] [raw]
Subject: [PATCH] NFS4 fix for recursive locking problem.

nfs4recover.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6.19-rc3/fs/nfsd/nfs4recover.c
===================================================================
--- linux-2.6.19-rc3.orig/fs/nfsd/nfs4recover.c 2006-10-24 04:32:02.000000000 +0530
+++ linux-2.6.19-rc3/fs/nfsd/nfs4recover.c 2006-10-31 18:27:30.000000000 +0530
@@ -274,7 +274,7 @@
* any regular files anyway, just in case the directory was created by
* a kernel from the future.... */
nfsd4_list_rec_dir(dentry, nfsd4_remove_clid_file);
- mutex_lock(&dir->d_inode->i_mutex);
+ mutex_lock_nested(&dir->d_inode->i_mutex, I_MUTEX_PARENT);
status = vfs_rmdir(dir->d_inode, dentry);
mutex_unlock(&dir->d_inode->i_mutex);
return status;

Attachments:
nfs4.fix (734.00 B)

2006-11-07 00:27:04

by J. Bruce Fields

[permalink] [raw]
Subject: Re: [PATCH] NFS4 fix for recursive locking problem.

On Tue, Oct 31, 2006 at 07:24:56PM +0530, Srinivasa Ds wrote:
> When I was performing some operations on NFS, I got below error on server
> side.
>
> ===========================================================
>
> =============================================
> [ INFO: possible recursive locking detected ]
> 2.6.19-prep #1
...
> So I have developed the patch to overcome this problem. Please let me know
> your comments on this.

Looks right, thanks!

--b.

> Signed-off-by: Srinivasa DS <[email protected]>
>
>
>

> nfs4recover.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> Index: linux-2.6.19-rc3/fs/nfsd/nfs4recover.c
> ===================================================================
> --- linux-2.6.19-rc3.orig/fs/nfsd/nfs4recover.c 2006-10-24 04:32:02.000000000 +0530
> +++ linux-2.6.19-rc3/fs/nfsd/nfs4recover.c 2006-10-31 18:27:30.000000000 +0530
> @@ -274,7 +274,7 @@
> * any regular files anyway, just in case the directory was created by
> * a kernel from the future.... */
> nfsd4_list_rec_dir(dentry, nfsd4_remove_clid_file);
> - mutex_lock(&dir->d_inode->i_mutex);
> + mutex_lock_nested(&dir->d_inode->i_mutex, I_MUTEX_PARENT);
> status = vfs_rmdir(dir->d_inode, dentry);
> mutex_unlock(&dir->d_inode->i_mutex);
> return status;