Merge branch 'fix/misc' into for-linus

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

diff --git a/fs/hfs/super.c b/fs/hfs/super.c
index 0bef62aa4f420b43f313510e01b638b8374570ba..1b55f704fb225270b68acd7fbef50179c25d5220 100644 (file)
--- a/fs/hfs/super.c
+++ b/fs/hfs/super.c
@@ -429,13 +429,12 @@ static int hfs_fill_super(struct super_block *sb, void *data, int silent)
        if (!root_inode)
                goto bail_no_root;
 
+       sb->s_d_op = &hfs_dentry_operations;
        res = -ENOMEM;
        sb->s_root = d_alloc_root(root_inode);
        if (!sb->s_root)
                goto bail_iput;
 
-       d_set_d_op(sb->s_root, &hfs_dentry_operations);
-
        /* everything's okay */
        return 0;