5 files changed, 8 insertions, 39 deletions

diff --git a/fs/hfsplus/bitmap.c b/fs/hfsplus/bitmap.c
index c7d316455fa..9fb51632303 100644
--- a/fs/hfsplus/bitmap.c
+++ b/fs/hfsplus/bitmap.c
@@ -29,7 +29,7 @@ int hfsplus_block_allocate(struct super_block *sb, u32 size, u32 offset, u32 *ma
                 return size;
 
         dprint(DBG_BITMAP, "block_allocate: %u,%u,%u\n", size, offset, len);
-        down(&HFSPLUS_SB(sb).alloc_file->i_sem);
+        mutex_lock(&HFSPLUS_SB(sb).alloc_file->i_mutex);
         mapping = HFSPLUS_SB(sb).alloc_file->i_mapping;
         page = read_cache_page(mapping, offset / PAGE_CACHE_BITS,
                                (filler_t *)mapping->a_ops->readpage, NULL);
@@ -143,7 +143,7 @@ done:
         sb->s_dirt = 1;
         dprint(DBG_BITMAP, "-> %u,%u\n", start, *max);
 out:
-        up(&HFSPLUS_SB(sb).alloc_file->i_sem);
+        mutex_unlock(&HFSPLUS_SB(sb).alloc_file->i_mutex);
         return start;
 }
 
@@ -164,7 +164,7 @@ int hfsplus_block_free(struct super_block *sb, u32 offset, u32 count)
         if ((offset + count) > HFSPLUS_SB(sb).total_blocks)
                 return -2;
 
-        down(&HFSPLUS_SB(sb).alloc_file->i_sem);
+        mutex_lock(&HFSPLUS_SB(sb).alloc_file->i_mutex);
         mapping = HFSPLUS_SB(sb).alloc_file->i_mapping;
         pnr = offset / PAGE_CACHE_BITS;
         page = read_cache_page(mapping, pnr, (filler_t *)mapping->a_ops->readpage, NULL);
@@ -215,7 +215,7 @@ out:
         kunmap(page);
         HFSPLUS_SB(sb).free_blocks += len;
         sb->s_dirt = 1;
-        up(&HFSPLUS_SB(sb).alloc_file->i_sem);
+        mutex_unlock(&HFSPLUS_SB(sb).alloc_file->i_mutex);
 
         return 0;
 }
diff --git a/fs/hfsplus/hfsplus_fs.h b/fs/hfsplus/hfsplus_fs.h
index df16fcbff3f..0fa1ab6250b 100644
--- a/fs/hfsplus/hfsplus_fs.h
+++ b/fs/hfsplus/hfsplus_fs.h
@@ -143,9 +143,6 @@ struct hfsplus_sb_info {
 
         unsigned long flags;
 
-        atomic_t inode_cnt;
-        u32 last_inode_cnt;
-
         struct hlist_head rsrc_inodes;
 };
 
diff --git a/fs/hfsplus/inode.c b/fs/hfsplus/inode.c
index fc98583cf04..7acff6c5464 100644
--- a/fs/hfsplus/inode.c
+++ b/fs/hfsplus/inode.c
@@ -182,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;
@@ -276,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;
 }
@@ -317,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;
diff --git a/fs/hfsplus/ioctl.c b/fs/hfsplus/ioctl.c
index e07aa096e07..13cf848ac83 100644
--- a/fs/hfsplus/ioctl.c
+++ b/fs/hfsplus/ioctl.c
@@ -12,6 +12,7 @@
  * hfsplus ioctls
  */
 
+#include <linux/capability.h>
 #include <linux/fs.h>
 #include <linux/sched.h>
 #include <linux/xattr.h>
diff --git a/fs/hfsplus/super.c b/fs/hfsplus/super.c
index 8093351bd7c..d791780def5 100644
--- a/fs/hfsplus/super.c
+++ b/fs/hfsplus/super.c
@@ -22,29 +22,12 @@ static void hfsplus_destroy_inode(struct inode *inode);
 
 #include "hfsplus_fs.h"
 
-void hfsplus_inode_check(struct super_block *sb)
-{
-#if 0
-        u32 cnt = atomic_read(&HFSPLUS_SB(sb).inode_cnt);
-        u32 last_cnt = HFSPLUS_SB(sb).last_inode_cnt;
-
-        if (cnt <= (last_cnt / 2) ||
-            cnt >= (last_cnt * 2)) {
-                HFSPLUS_SB(sb).last_inode_cnt = cnt;
-                printk("inode_check: %u,%u,%u\n", cnt, last_cnt,
-                        HFSPLUS_SB(sb).cat_tree ? HFSPLUS_SB(sb).cat_tree->node_hash_cnt : 0);
-        }
-#endif
-}
-
 static void hfsplus_read_inode(struct inode *inode)
 {
         struct hfs_find_data fd;
         struct hfsplus_vh *vhdr;
         int err;
 
-        atomic_inc(&HFSPLUS_SB(inode->i_sb).inode_cnt);
-        hfsplus_inode_check(inode->i_sb);
         INIT_LIST_HEAD(&HFSPLUS_I(inode).open_dir_list);
         init_MUTEX(&HFSPLUS_I(inode).extents_lock);
         HFSPLUS_I(inode).flags = 0;
@@ -155,12 +138,10 @@ static int hfsplus_write_inode(struct inode *inode, int unused)
 static void hfsplus_clear_inode(struct inode *inode)
 {
         dprint(DBG_INODE, "hfsplus_clear_inode: %lu\n", inode->i_ino);
-        atomic_dec(&HFSPLUS_SB(inode->i_sb).inode_cnt);
         if (HFSPLUS_IS_RSRC(inode)) {
                 HFSPLUS_I(HFSPLUS_I(inode).rsrc_inode).rsrc_inode = NULL;
                 iput(HFSPLUS_I(inode).rsrc_inode);
         }
-        hfsplus_inode_check(inode->i_sb);
 }
 
 static void hfsplus_write_super(struct super_block *sb)
@@ -320,7 +301,7 @@ static int hfsplus_fill_super(struct super_block *sb, void *data, int silent)
         /* temporarily use utf8 to correctly find the hidden dir below */
         nls = sbi->nls;
         sbi->nls = load_nls("utf8");
-        if (!nls) {
+        if (!sbi->nls) {
                 printk("HFS+: unable to load nls for utf8\n");
                 err = -EINVAL;
                 goto cleanup;