Pull battery into release branch

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

diff --git a/fs/hfsplus/super.c b/fs/hfsplus/super.c
index 42570c95ad624f28f34fdc35c8f833e75cea2bf4..7b0f2e5a44e2bce847c9c3e59c141c4a4821639f 100644 (file)
--- a/fs/hfsplus/super.c
+++ b/fs/hfsplus/super.c
@@ -380,6 +380,7 @@ static int hfsplus_fill_super(struct super_block *sb, void *data, int silent)
                iput(root);
                goto cleanup;
        }
+       sb->s_root->d_op = &hfsplus_dentry_operations;
 
        str.len = sizeof(HFSP_HIDDENDIR_NAME) - 1;
        str.name = HFSP_HIDDENDIR_NAME;
@@ -478,7 +479,7 @@ static int __init init_hfsplus_fs(void)
 
        hfsplus_inode_cachep = kmem_cache_create("hfsplus_icache",
                HFSPLUS_INODE_SIZE, 0, SLAB_HWCACHE_ALIGN,
-               hfsplus_init_once, NULL);
+               hfsplus_init_once);
        if (!hfsplus_inode_cachep)
                return -ENOMEM;
        err = register_filesystem(&hfsplus_fs_type);