diff options
author | Jeff Layton <jlayton@redhat.com> | 2012-11-28 11:30:53 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-12-20 13:57:36 -0500 |
commit | 39e3c9553f34381a1b664c27b0c696a266a5735e (patch) | |
tree | f754789dccac7a017ee8feb602b01dd42b73023d /fs/btrfs/inode.c | |
parent | 741b7c3f77937b2fb7c10aeb4c5c621463582583 (diff) |
vfs: remove DCACHE_NEED_LOOKUP
The code that relied on that flag was ripped out of btrfs quite some
time ago, and never added back. Josef indicated that he was going to
take a different approach to the problem in btrfs, and that we
could just eliminate this flag.
Cc: Josef Bacik <jbacik@fusionio.com>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/btrfs/inode.c')
-rw-r--r-- | fs/btrfs/inode.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 67ed24ae86bb..16d9e8e191e6 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c | |||
@@ -4262,16 +4262,7 @@ struct inode *btrfs_lookup_dentry(struct inode *dir, struct dentry *dentry) | |||
4262 | if (dentry->d_name.len > BTRFS_NAME_LEN) | 4262 | if (dentry->d_name.len > BTRFS_NAME_LEN) |
4263 | return ERR_PTR(-ENAMETOOLONG); | 4263 | return ERR_PTR(-ENAMETOOLONG); |
4264 | 4264 | ||
4265 | if (unlikely(d_need_lookup(dentry))) { | 4265 | ret = btrfs_inode_by_name(dir, dentry, &location); |
4266 | memcpy(&location, dentry->d_fsdata, sizeof(struct btrfs_key)); | ||
4267 | kfree(dentry->d_fsdata); | ||
4268 | dentry->d_fsdata = NULL; | ||
4269 | /* This thing is hashed, drop it for now */ | ||
4270 | d_drop(dentry); | ||
4271 | } else { | ||
4272 | ret = btrfs_inode_by_name(dir, dentry, &location); | ||
4273 | } | ||
4274 | |||
4275 | if (ret < 0) | 4266 | if (ret < 0) |
4276 | return ERR_PTR(ret); | 4267 | return ERR_PTR(ret); |
4277 | 4268 | ||
@@ -4341,11 +4332,6 @@ static struct dentry *btrfs_lookup(struct inode *dir, struct dentry *dentry, | |||
4341 | struct dentry *ret; | 4332 | struct dentry *ret; |
4342 | 4333 | ||
4343 | ret = d_splice_alias(btrfs_lookup_dentry(dir, dentry), dentry); | 4334 | ret = d_splice_alias(btrfs_lookup_dentry(dir, dentry), dentry); |
4344 | if (unlikely(d_need_lookup(dentry))) { | ||
4345 | spin_lock(&dentry->d_lock); | ||
4346 | dentry->d_flags &= ~DCACHE_NEED_LOOKUP; | ||
4347 | spin_unlock(&dentry->d_lock); | ||
4348 | } | ||
4349 | return ret; | 4335 | return ret; |
4350 | } | 4336 | } |
4351 | 4337 | ||