aboutsummaryrefslogtreecommitdiffstats
path: root/fs/adfs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2010-12-18 11:20:57 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2011-01-12 20:02:45 -0500
commit96e1391414f80a8a3bae74ddf58d3c2870e304f0 (patch)
tree8280de4d3c48cf0570f4d4e9edecfb554516d0bc /fs/adfs
parenteddf790bd41aa153922df223b4692cc606cadb7b (diff)
switch adfs
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/adfs')
-rw-r--r--fs/adfs/dir.c1
-rw-r--r--fs/adfs/super.c4
2 files changed, 2 insertions, 3 deletions
diff --git a/fs/adfs/dir.c b/fs/adfs/dir.c
index bf7693c384f9..3b4a764ed780 100644
--- a/fs/adfs/dir.c
+++ b/fs/adfs/dir.c
@@ -276,7 +276,6 @@ adfs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd)
276 struct object_info obj; 276 struct object_info obj;
277 int error; 277 int error;
278 278
279 d_set_d_op(dentry, &adfs_dentry_operations);
280 lock_kernel(); 279 lock_kernel();
281 error = adfs_dir_lookup_byname(dir, &dentry->d_name, &obj); 280 error = adfs_dir_lookup_byname(dir, &dentry->d_name, &obj);
282 if (error == 0) { 281 if (error == 0) {
diff --git a/fs/adfs/super.c b/fs/adfs/super.c
index a4041b52fbca..2d7954049fbe 100644
--- a/fs/adfs/super.c
+++ b/fs/adfs/super.c
@@ -473,6 +473,7 @@ static int adfs_fill_super(struct super_block *sb, void *data, int silent)
473 asb->s_namelen = ADFS_F_NAME_LEN; 473 asb->s_namelen = ADFS_F_NAME_LEN;
474 } 474 }
475 475
476 sb->s_d_op = &adfs_dentry_operations;
476 root = adfs_iget(sb, &root_obj); 477 root = adfs_iget(sb, &root_obj);
477 sb->s_root = d_alloc_root(root); 478 sb->s_root = d_alloc_root(root);
478 if (!sb->s_root) { 479 if (!sb->s_root) {
@@ -483,8 +484,7 @@ static int adfs_fill_super(struct super_block *sb, void *data, int silent)
483 kfree(asb->s_map); 484 kfree(asb->s_map);
484 adfs_error(sb, "get root inode failed\n"); 485 adfs_error(sb, "get root inode failed\n");
485 goto error; 486 goto error;
486 } else 487 }
487 d_set_d_op(sb->s_root, &adfs_dentry_operations);
488 unlock_kernel(); 488 unlock_kernel();
489 return 0; 489 return 0;
490 490