]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
affs: fix missing unlocks in affs_remove_link
authorChristoph Hellwig <hch@lst.de>
Fri, 9 May 2008 10:35:29 +0000 (12:35 +0200)
committerAl Viro <viro@zeniv.linux.org.uk>
Fri, 27 Mar 2009 18:43:56 +0000 (14:43 -0400)
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>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/affs/amigaffs.c

index 805573005de66614cec77f00f83593c61fa1f027..7d0f0a30f7a3670d804b9c045e4385d961e32cdb 100644 (file)
@@ -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);