Merge master.kernel.org:/pub/scm/linux/kernel/git/mingo/mutex-2.6

1 files changed, 2 insertions, 2 deletions

diff --git a/fs/hfs/inode.c b/fs/hfs/inode.c
index d499393a8ae7..050a49276499 100644
--- a/fs/hfs/inode.c
+++ b/fs/hfs/inode.c
@@ -547,13 +547,13 @@ static int hfs_file_release(struct inode *inode, struct file *file)
         if (atomic_read(&file->f_count) != 0)
                 return 0;
         if (atomic_dec_and_test(&HFS_I(inode)->opencnt)) {
-                down(&inode->i_sem);
+                mutex_lock(&inode->i_mutex);
                 hfs_file_truncate(inode);
                 //if (inode->i_flags & S_DEAD) {
                 //      hfs_delete_cat(inode->i_ino, HFSPLUS_SB(sb).hidden_dir, NULL);
                 //      hfs_delete_inode(inode);
                 //}
-                up(&inode->i_sem);
+                mutex_unlock(&inode->i_mutex);
         }
         return 0;
 }