From 96e1391414f80a8a3bae74ddf58d3c2870e304f0 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sat, 18 Dec 2010 11:20:57 -0500 Subject: switch adfs Signed-off-by: Al Viro --- fs/adfs/dir.c | 1 - fs/adfs/super.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'fs/adfs') diff --git a/fs/adfs/dir.c b/fs/adfs/dir.c index bf7693c384f..3b4a764ed78 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) struct object_info obj; int error; - d_set_d_op(dentry, &adfs_dentry_operations); lock_kernel(); error = adfs_dir_lookup_byname(dir, &dentry->d_name, &obj); if (error == 0) { diff --git a/fs/adfs/super.c b/fs/adfs/super.c index a4041b52fbc..2d7954049fb 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) asb->s_namelen = ADFS_F_NAME_LEN; } + sb->s_d_op = &adfs_dentry_operations; root = adfs_iget(sb, &root_obj); sb->s_root = d_alloc_root(root); if (!sb->s_root) { @@ -483,8 +484,7 @@ static int adfs_fill_super(struct super_block *sb, void *data, int silent) kfree(asb->s_map); adfs_error(sb, "get root inode failed\n"); goto error; - } else - d_set_d_op(sb->s_root, &adfs_dentry_operations); + } unlock_kernel(); return 0; -- cgit v1.2.3-70-g09d2