aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2010-12-18 11:19:14 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2011-01-12 20:02:45 -0500
commit518c79d28e22f657fec399ef5bf0d50b13f7e9b0 (patch)
tree99640745d2c1b9a72e98eeb36df80a7e5080c8f1 /fs
parentc6cb412366e8f338baae7300b9f1961f3e559a24 (diff)
switch hfs
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
-rw-r--r--fs/hfs/dir.c2
-rw-r--r--fs/hfs/super.c3
2 files changed, 1 insertions, 4 deletions
diff --git a/fs/hfs/dir.c b/fs/hfs/dir.c
index ea4aefe7c652..afa66aaa2237 100644
--- a/fs/hfs/dir.c
+++ b/fs/hfs/dir.c
@@ -25,8 +25,6 @@ static struct dentry *hfs_lookup(struct inode *dir, struct dentry *dentry,
25 struct inode *inode = NULL; 25 struct inode *inode = NULL;
26 int res; 26 int res;
27 27
28 d_set_d_op(dentry, &hfs_dentry_operations);
29
30 hfs_find_init(HFS_SB(dir->i_sb)->cat_tree, &fd); 28 hfs_find_init(HFS_SB(dir->i_sb)->cat_tree, &fd);
31 hfs_cat_build_key(dir->i_sb, fd.search_key, dir->i_ino, &dentry->d_name); 29 hfs_cat_build_key(dir->i_sb, fd.search_key, dir->i_ino, &dentry->d_name);
32 res = hfs_brec_read(&fd, &rec, sizeof(rec)); 30 res = hfs_brec_read(&fd, &rec, sizeof(rec));
diff --git a/fs/hfs/super.c b/fs/hfs/super.c
index 0bef62aa4f42..1b55f704fb22 100644
--- 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)
429 if (!root_inode) 429 if (!root_inode)
430 goto bail_no_root; 430 goto bail_no_root;
431 431
432 sb->s_d_op = &hfs_dentry_operations;
432 res = -ENOMEM; 433 res = -ENOMEM;
433 sb->s_root = d_alloc_root(root_inode); 434 sb->s_root = d_alloc_root(root_inode);
434 if (!sb->s_root) 435 if (!sb->s_root)
435 goto bail_iput; 436 goto bail_iput;
436 437
437 d_set_d_op(sb->s_root, &hfs_dentry_operations);
438
439 /* everything's okay */ 438 /* everything's okay */
440 return 0; 439 return 0;
441 440