Merge HEAD from oss.sgi.com:/oss/git/linux-2.6.git

[linux-2.6] / fs / hfsplus / inode.c

diff --git a/fs/hfsplus/inode.c b/fs/hfsplus/inode.c
index f205773ddfbebc661fce1278306234cfd1538945..7acff6c5464ffdca66599d0dbebe524571139c40 100644 (file)
--- a/fs/hfsplus/inode.c
+++ b/fs/hfsplus/inode.c
@@ -11,7 +11,6 @@
 #include <linux/mm.h>
 #include <linux/fs.h>
 #include <linux/pagemap.h>
-#include <linux/version.h>
 #include <linux/mpage.h>
 
 #include "hfsplus_fs.h"
@@ -183,11 +182,6 @@ static struct dentry *hfsplus_file_lookup(struct inode *dir, struct dentry *dent
        igrab(dir);
        hlist_add_head(&inode->i_hash, &HFSPLUS_SB(sb).rsrc_inodes);
        mark_inode_dirty(inode);
-       {
-       void hfsplus_inode_check(struct super_block *sb);
-       atomic_inc(&HFSPLUS_SB(sb).inode_cnt);
-       hfsplus_inode_check(sb);
-       }
 out:
        d_add(dentry, inode);
        return NULL;
@@ -277,13 +271,13 @@ static int hfsplus_file_release(struct inode *inode, struct file *file)
        if (atomic_read(&file->f_count) != 0)
                return 0;
        if (atomic_dec_and_test(&HFSPLUS_I(inode).opencnt)) {
-               down(&inode->i_sem);
+               mutex_lock(&inode->i_mutex);
                hfsplus_file_truncate(inode);
                if (inode->i_flags & S_DEAD) {
                        hfsplus_delete_cat(inode->i_ino, HFSPLUS_SB(sb).hidden_dir, NULL);
                        hfsplus_delete_inode(inode);
                }
-               up(&inode->i_sem);
+               mutex_unlock(&inode->i_mutex);
        }
        return 0;
 }
@@ -318,11 +312,6 @@ struct inode *hfsplus_new_inode(struct super_block *sb, int mode)
        if (!inode)
                return NULL;
 
-       {
-       void hfsplus_inode_check(struct super_block *sb);
-       atomic_inc(&HFSPLUS_SB(sb).inode_cnt);
-       hfsplus_inode_check(sb);
-       }
        inode->i_ino = HFSPLUS_SB(sb).next_cnid++;
        inode->i_mode = mode;
        inode->i_uid = current->fsuid;