iget: stop HFSPLUS from using iget() and read_inode()

Stop the HFSPLUS filesystem from using iget() and read_inode().  Replace
hfsplus_read_inode() with hfsplus_iget(), and call that instead of iget().
hfsplus_iget() then uses iget_locked() directly and returns a proper error
code instead of an inode in the event of an error.

hfsplus_fill_super() returns any error incurred when getting the root inode.

Signed-off-by: David Howells <dhowells@redhat.com>
Cc: Roman Zippel <zippel@linux-m68k.org>
Acked-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 4 insertions, 2 deletions

diff --git a/fs/hfsplus/btree.c b/fs/hfsplus/btree.c
index 050d29c0a5b5..bb5433608a42 100644
--- a/fs/hfsplus/btree.c
+++ b/fs/hfsplus/btree.c
@@ -22,6 +22,7 @@ struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id)
         struct hfs_btree *tree;
         struct hfs_btree_header_rec *head;
         struct address_space *mapping;
+        struct inode *inode;
         struct page *page;
         unsigned int size;
 
@@ -33,9 +34,10 @@ struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id)
         spin_lock_init(&tree->hash_lock);
         tree->sb = sb;
         tree->cnid = id;
-        tree->inode = iget(sb, id);
-        if (!tree->inode)
+        inode = hfsplus_iget(sb, id);
+        if (IS_ERR(inode))
                 goto free_tree;
+        tree->inode = inode;
 
         mapping = tree->inode->i_mapping;
         page = read_mapping_page(mapping, 0, NULL);