diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2010-12-18 11:19:23 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-01-12 20:02:45 -0500 |
commit | eddf790bd41aa153922df223b4692cc606cadb7b (patch) | |
tree | b0d1e47588c0dd4797eece4078c3ced34e485f13 /fs/hfsplus | |
parent | 518c79d28e22f657fec399ef5bf0d50b13f7e9b0 (diff) |
switch hfsplus
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/hfsplus')
-rw-r--r-- | fs/hfsplus/dir.c | 1 | ||||
-rw-r--r-- | fs/hfsplus/super.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/fs/hfsplus/dir.c b/fs/hfsplus/dir.c index f896dc843026..4df5059c25da 100644 --- a/fs/hfsplus/dir.c +++ b/fs/hfsplus/dir.c | |||
@@ -37,7 +37,6 @@ static struct dentry *hfsplus_lookup(struct inode *dir, struct dentry *dentry, | |||
37 | 37 | ||
38 | sb = dir->i_sb; | 38 | sb = dir->i_sb; |
39 | 39 | ||
40 | d_set_d_op(dentry, &hfsplus_dentry_operations); | ||
41 | dentry->d_fsdata = NULL; | 40 | dentry->d_fsdata = NULL; |
42 | hfs_find_init(HFSPLUS_SB(sb)->cat_tree, &fd); | 41 | hfs_find_init(HFSPLUS_SB(sb)->cat_tree, &fd); |
43 | hfsplus_cat_build_key(sb, fd.search_key, dir->i_ino, &dentry->d_name); | 42 | hfsplus_cat_build_key(sb, fd.search_key, dir->i_ino, &dentry->d_name); |
diff --git a/fs/hfsplus/super.c b/fs/hfsplus/super.c index 6ee6ad20acf2..9a3b4795f43c 100644 --- a/fs/hfsplus/super.c +++ b/fs/hfsplus/super.c | |||
@@ -444,13 +444,13 @@ static int hfsplus_fill_super(struct super_block *sb, void *data, int silent) | |||
444 | err = PTR_ERR(root); | 444 | err = PTR_ERR(root); |
445 | goto cleanup; | 445 | goto cleanup; |
446 | } | 446 | } |
447 | sb->s_d_op = &hfsplus_dentry_operations; | ||
447 | sb->s_root = d_alloc_root(root); | 448 | sb->s_root = d_alloc_root(root); |
448 | if (!sb->s_root) { | 449 | if (!sb->s_root) { |
449 | iput(root); | 450 | iput(root); |
450 | err = -ENOMEM; | 451 | err = -ENOMEM; |
451 | goto cleanup; | 452 | goto cleanup; |
452 | } | 453 | } |
453 | d_set_d_op(sb->s_root, &hfsplus_dentry_operations); | ||
454 | 454 | ||
455 | str.len = sizeof(HFSP_HIDDENDIR_NAME) - 1; | 455 | str.len = sizeof(HFSP_HIDDENDIR_NAME) - 1; |
456 | str.name = HFSP_HIDDENDIR_NAME; | 456 | str.name = HFSP_HIDDENDIR_NAME; |