switch hfs
authorAl Viro <viro@zeniv.linux.org.uk>
Sat, 18 Dec 2010 16:19:14 +0000 (11:19 -0500)
committerAl Viro <viro@zeniv.linux.org.uk>
Thu, 13 Jan 2011 01:02:45 +0000 (20:02 -0500)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/hfs/dir.c
fs/hfs/super.c

index ea4aefe7c652c14a651d790bfeba842609cb0b64..afa66aaa2237940b9e97ec47d47bd0cea16181b9 100644 (file)
@@ -25,8 +25,6 @@ static struct dentry *hfs_lookup(struct inode *dir, struct dentry *dentry,
        struct inode *inode = NULL;
        int res;
 
-       d_set_d_op(dentry, &hfs_dentry_operations);
-
        hfs_find_init(HFS_SB(dir->i_sb)->cat_tree, &fd);
        hfs_cat_build_key(dir->i_sb, fd.search_key, dir->i_ino, &dentry->d_name);
        res = hfs_brec_read(&fd, &rec, sizeof(rec));
index 0bef62aa4f420b43f313510e01b638b8374570ba..1b55f704fb225270b68acd7fbef50179c25d5220 100644 (file)
@@ -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;