Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched

[mv-sheeva.git] / fs / hfsplus / super.c

diff --git a/fs/hfsplus/super.c b/fs/hfsplus/super.c
index ebd1b380cbbc9d7dc839ca7337efb5073da8cd86..6d87a2a9534d4baa56dbd466016106b78d87daa9 100644 (file)
--- a/fs/hfsplus/super.c
+++ b/fs/hfsplus/super.c
@@ -283,11 +283,10 @@ static int hfsplus_fill_super(struct super_block *sb, void *data, int silent)
        struct nls_table *nls = NULL;
        int err = -EINVAL;
 
-       sbi = kmalloc(sizeof(struct hfsplus_sb_info), GFP_KERNEL);
+       sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);
        if (!sbi)
                return -ENOMEM;
 
-       memset(sbi, 0, sizeof(HFSPLUS_SB(sb)));
        sb->s_fs_info = sbi;
        INIT_HLIST_HEAD(&sbi->rsrc_inodes);
        hfsplus_fill_defaults(sbi);
@@ -381,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;