1 files changed, 9 insertions, 7 deletions

diff --git a/fs/hfsplus/extents.c b/fs/hfsplus/extents.c
index fbb212fbb1ef..a7aafb35b624 100644
--- a/fs/hfsplus/extents.c
+++ b/fs/hfsplus/extents.c
@@ -227,10 +227,8 @@ int hfsplus_get_block(struct inode *inode, sector_t iblock,
         u32 ablock, dblock, mask;
         sector_t sector;
         int was_dirty = 0;
-        int shift;
 
         /* Convert inode block to disk allocation block */
-        shift = sbi->alloc_blksz_shift - sb->s_blocksize_bits;
         ablock = iblock >> sbi->fs_shift;
 
         if (iblock >= hip->fs_blocks) {
@@ -498,11 +496,13 @@ int hfsplus_file_extend(struct inode *inode)
                         goto insert_extent;
         }
 out:
-        mutex_unlock(&hip->extents_lock);
         if (!res) {
                 hip->alloc_blocks += len;
+                mutex_unlock(&hip->extents_lock);
                 hfsplus_mark_inode_dirty(inode, HFSPLUS_I_ALLOC_DIRTY);
+                return 0;
         }
+        mutex_unlock(&hip->extents_lock);
         return res;
 
 insert_extent:
@@ -556,11 +556,13 @@ void hfsplus_file_truncate(struct inode *inode)
 
         blk_cnt = (inode->i_size + HFSPLUS_SB(sb)->alloc_blksz - 1) >>
                         HFSPLUS_SB(sb)->alloc_blksz_shift;
+
+        mutex_lock(&hip->extents_lock);
+
         alloc_cnt = hip->alloc_blocks;
         if (blk_cnt == alloc_cnt)
-                goto out;
+                goto out_unlock;
 
-        mutex_lock(&hip->extents_lock);
         res = hfs_find_init(HFSPLUS_SB(sb)->ext_tree, &fd);
         if (res) {
                 mutex_unlock(&hip->extents_lock);
@@ -592,10 +594,10 @@ void hfsplus_file_truncate(struct inode *inode)
                 hfs_brec_remove(&fd);
         }
         hfs_find_exit(&fd);
-        mutex_unlock(&hip->extents_lock);
 
         hip->alloc_blocks = blk_cnt;
-out:
+out_unlock:
+        mutex_unlock(&hip->extents_lock);
         hip->phys_size = inode->i_size;
         hip->fs_blocks = (inode->i_size + sb->s_blocksize - 1) >>
                 sb->s_blocksize_bits;