Re: JFS: possible recursive locking detected

[Dave Kleikamp <shaggy@linux.vnet.ibm.com>]

On Tue, 2007-01-09 at 15:02 +0530, Srinivasa Ds wrote:
> Tomasz Kvarsin wrote:
> > This I got during boot with 2.6.20-rc4:
> > =============================================
> > [ INFO: possible recursive locking detected ]

... 

> So below patch should fix this problem,please test this. Let me know 
> your comments on this.

I'm sure there are several other places in the jfs code that need the
same treatment.  I've put this off too long already.  I'll get a
comprehensive lock annotation patch out today, starting with this one.

> 
> Signed-off-by: Srinivasa DS <srinivasa@in.ibm.com>

Thanks,
Shaggy

> 
> 
> plain text document attachment (jfs.fix)
>  namei.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> Index: linux-2.6.20-rc4/fs/jfs/namei.c
> ===================================================================
> --- linux-2.6.20-rc4.orig/fs/jfs/namei.c
> +++ linux-2.6.20-rc4/fs/jfs/namei.c
> @@ -104,8 +104,8 @@ static int jfs_create(struct inode *dip,
>  
>  	tid = txBegin(dip->i_sb, 0);
>  
> -	mutex_lock(&JFS_IP(dip)->commit_mutex);
> -	mutex_lock(&JFS_IP(ip)->commit_mutex);
> +	mutex_lock_nested(&JFS_IP(dip)->commit_mutex, I_MUTEX_PARENT);
> +	mutex_lock_nested(&JFS_IP(ip)->commit_mutex, I_MUTEX_CHILD);
>  
>  	rc = jfs_init_acl(tid, ip, dip);
>  	if (rc)
-- 
David Kleikamp
IBM Linux Technology Center