diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2010-12-18 11:20:57 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-01-12 20:02:45 -0500 |
| commit | 96e1391414f80a8a3bae74ddf58d3c2870e304f0 (patch) | |
| tree | 8280de4d3c48cf0570f4d4e9edecfb554516d0bc /fs | |
| parent | eddf790bd41aa153922df223b4692cc606cadb7b (diff) | |
| download | blackbird-op-linux-96e1391414f80a8a3bae74ddf58d3c2870e304f0.tar.gz blackbird-op-linux-96e1391414f80a8a3bae74ddf58d3c2870e304f0.zip | |
switch adfs
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/adfs/dir.c | 1 | ||||
| -rw-r--r-- | fs/adfs/super.c | 4 |
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) 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 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) 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; |
