From mboxrd@z Thu Jan  1 00:00:00 1970
From: Christoph Hellwig <hch@lst.de>
Subject: Re: [PATCH] affs: fix missing unlocks in affs_remove_link
Date: Wed, 21 May 2008 14:38:21 +0200
Message-ID: <20080521123821.GA23617@lst.de>
References: <20080509103529.GA7445@lst.de>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: linux-fsdevel@vger.kernel.org
To: Roman Zippel <zippel@linux-m68k.org>
Return-path: <linux-fsdevel-owner@vger.kernel.org>
Received: from verein.lst.de ([213.95.11.210]:33483 "EHLO verein.lst.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S932892AbYEUMia (ORCPT <rfc822;linux-fsdevel@vger.kernel.org>);
	Wed, 21 May 2008 08:38:30 -0400
Content-Disposition: inline
In-Reply-To: <20080509103529.GA7445@lst.de>
Sender: linux-fsdevel-owner@vger.kernel.org
List-ID: <linux-fsdevel.vger.kernel.org>

ping?

On Fri, May 09, 2008 at 12:35:29PM +0200, Christoph Hellwig wrote:
> In two error cases affs_remove_link doesn't call affs_unlock_dir to
> release the i_hash_lock semaphore.
> 
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> 
> Index: linux-2.6/fs/affs/amigaffs.c
> ===================================================================
> --- linux-2.6.orig/fs/affs/amigaffs.c	2008-04-29 17:15:30.000000000 +0200
> +++ linux-2.6/fs/affs/amigaffs.c	2008-04-29 17:16:15.000000000 +0200
> @@ -179,14 +179,18 @@ affs_remove_link(struct dentry *dentry)
>  		affs_lock_dir(dir);
>  		affs_fix_dcache(dentry, link_ino);
>  		retval = affs_remove_hash(dir, link_bh);
> -		if (retval)
> +		if (retval) {
> +			affs_unlock_dir(dir);
>  			goto done;
> +		}
>  		mark_buffer_dirty_inode(link_bh, inode);
>  
>  		memcpy(AFFS_TAIL(sb, bh)->name, AFFS_TAIL(sb, link_bh)->name, 32);
>  		retval = affs_insert_hash(dir, bh);
> -		if (retval)
> +		if (retval) {
> +			affs_unlock_dir(dir);
>  			goto done;
> +		}
>  		mark_buffer_dirty_inode(bh, inode);
>  
>  		affs_unlock_dir(dir);
---end quoted text---