|
@@ -20,11 +20,18 @@ static void hfsplus_destroy_inode(struct inode *inode);
|
|
|
|
|
|
#include "hfsplus_fs.h"
|
|
|
|
|
|
-static void hfsplus_read_inode(struct inode *inode)
|
|
|
+struct inode *hfsplus_iget(struct super_block *sb, unsigned long ino)
|
|
|
{
|
|
|
struct hfs_find_data fd;
|
|
|
struct hfsplus_vh *vhdr;
|
|
|
- int err;
|
|
|
+ struct inode *inode;
|
|
|
+ long err = -EIO;
|
|
|
+
|
|
|
+ inode = iget_locked(sb, ino);
|
|
|
+ if (!inode)
|
|
|
+ return ERR_PTR(-ENOMEM);
|
|
|
+ if (!(inode->i_state & I_NEW))
|
|
|
+ return inode;
|
|
|
|
|
|
INIT_LIST_HEAD(&HFSPLUS_I(inode).open_dir_list);
|
|
|
init_MUTEX(&HFSPLUS_I(inode).extents_lock);
|
|
@@ -41,7 +48,7 @@ static void hfsplus_read_inode(struct inode *inode)
|
|
|
hfs_find_exit(&fd);
|
|
|
if (err)
|
|
|
goto bad_inode;
|
|
|
- return;
|
|
|
+ goto done;
|
|
|
}
|
|
|
vhdr = HFSPLUS_SB(inode->i_sb).s_vhdr;
|
|
|
switch(inode->i_ino) {
|
|
@@ -70,10 +77,13 @@ static void hfsplus_read_inode(struct inode *inode)
|
|
|
goto bad_inode;
|
|
|
}
|
|
|
|
|
|
- return;
|
|
|
+done:
|
|
|
+ unlock_new_inode(inode);
|
|
|
+ return inode;
|
|
|
|
|
|
- bad_inode:
|
|
|
- make_bad_inode(inode);
|
|
|
+bad_inode:
|
|
|
+ iget_failed(inode);
|
|
|
+ return ERR_PTR(err);
|
|
|
}
|
|
|
|
|
|
static int hfsplus_write_inode(struct inode *inode, int unused)
|
|
@@ -262,7 +272,6 @@ static int hfsplus_remount(struct super_block *sb, int *flags, char *data)
|
|
|
static const struct super_operations hfsplus_sops = {
|
|
|
.alloc_inode = hfsplus_alloc_inode,
|
|
|
.destroy_inode = hfsplus_destroy_inode,
|
|
|
- .read_inode = hfsplus_read_inode,
|
|
|
.write_inode = hfsplus_write_inode,
|
|
|
.clear_inode = hfsplus_clear_inode,
|
|
|
.put_super = hfsplus_put_super,
|
|
@@ -278,7 +287,7 @@ static int hfsplus_fill_super(struct super_block *sb, void *data, int silent)
|
|
|
struct hfsplus_sb_info *sbi;
|
|
|
hfsplus_cat_entry entry;
|
|
|
struct hfs_find_data fd;
|
|
|
- struct inode *root;
|
|
|
+ struct inode *root, *inode;
|
|
|
struct qstr str;
|
|
|
struct nls_table *nls = NULL;
|
|
|
int err = -EINVAL;
|
|
@@ -366,18 +375,25 @@ static int hfsplus_fill_super(struct super_block *sb, void *data, int silent)
|
|
|
goto cleanup;
|
|
|
}
|
|
|
|
|
|
- HFSPLUS_SB(sb).alloc_file = iget(sb, HFSPLUS_ALLOC_CNID);
|
|
|
- if (!HFSPLUS_SB(sb).alloc_file) {
|
|
|
+ inode = hfsplus_iget(sb, HFSPLUS_ALLOC_CNID);
|
|
|
+ if (IS_ERR(inode)) {
|
|
|
printk(KERN_ERR "hfs: failed to load allocation file\n");
|
|
|
+ err = PTR_ERR(inode);
|
|
|
goto cleanup;
|
|
|
}
|
|
|
+ HFSPLUS_SB(sb).alloc_file = inode;
|
|
|
|
|
|
/* Load the root directory */
|
|
|
- root = iget(sb, HFSPLUS_ROOT_CNID);
|
|
|
+ root = hfsplus_iget(sb, HFSPLUS_ROOT_CNID);
|
|
|
+ if (IS_ERR(root)) {
|
|
|
+ printk(KERN_ERR "hfs: failed to load root directory\n");
|
|
|
+ err = PTR_ERR(root);
|
|
|
+ goto cleanup;
|
|
|
+ }
|
|
|
sb->s_root = d_alloc_root(root);
|
|
|
if (!sb->s_root) {
|
|
|
- printk(KERN_ERR "hfs: failed to load root directory\n");
|
|
|
iput(root);
|
|
|
+ err = -ENOMEM;
|
|
|
goto cleanup;
|
|
|
}
|
|
|
sb->s_root->d_op = &hfsplus_dentry_operations;
|
|
@@ -390,9 +406,12 @@ static int hfsplus_fill_super(struct super_block *sb, void *data, int silent)
|
|
|
hfs_find_exit(&fd);
|
|
|
if (entry.type != cpu_to_be16(HFSPLUS_FOLDER))
|
|
|
goto cleanup;
|
|
|
- HFSPLUS_SB(sb).hidden_dir = iget(sb, be32_to_cpu(entry.folder.id));
|
|
|
- if (!HFSPLUS_SB(sb).hidden_dir)
|
|
|
+ inode = hfsplus_iget(sb, be32_to_cpu(entry.folder.id));
|
|
|
+ if (IS_ERR(inode)) {
|
|
|
+ err = PTR_ERR(inode);
|
|
|
goto cleanup;
|
|
|
+ }
|
|
|
+ HFSPLUS_SB(sb).hidden_dir = inode;
|
|
|
} else
|
|
|
hfs_find_exit(&fd);
|
|
|
|