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/namei.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/namei.c')
-rw-r--r-- | fs/namei.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/fs/namei.c b/fs/namei.c index 35195ff9d194..25a41e02984b 100644 --- a/fs/namei.c +++ b/fs/namei.c | |||
@@ -1275,9 +1275,7 @@ static struct dentry *lookup_dcache(struct qstr *name, struct dentry *dir, | |||
1275 | *need_lookup = false; | 1275 | *need_lookup = false; |
1276 | dentry = d_lookup(dir, name); | 1276 | dentry = d_lookup(dir, name); |
1277 | if (dentry) { | 1277 | if (dentry) { |
1278 | if (d_need_lookup(dentry)) { | 1278 | if (dentry->d_flags & DCACHE_OP_REVALIDATE) { |
1279 | *need_lookup = true; | ||
1280 | } else if (dentry->d_flags & DCACHE_OP_REVALIDATE) { | ||
1281 | error = d_revalidate(dentry, flags); | 1279 | error = d_revalidate(dentry, flags); |
1282 | if (unlikely(error <= 0)) { | 1280 | if (unlikely(error <= 0)) { |
1283 | if (error < 0) { | 1281 | if (error < 0) { |
@@ -1383,8 +1381,6 @@ static int lookup_fast(struct nameidata *nd, struct qstr *name, | |||
1383 | return -ECHILD; | 1381 | return -ECHILD; |
1384 | nd->seq = seq; | 1382 | nd->seq = seq; |
1385 | 1383 | ||
1386 | if (unlikely(d_need_lookup(dentry))) | ||
1387 | goto unlazy; | ||
1388 | if (unlikely(dentry->d_flags & DCACHE_OP_REVALIDATE)) { | 1384 | if (unlikely(dentry->d_flags & DCACHE_OP_REVALIDATE)) { |
1389 | status = d_revalidate(dentry, nd->flags); | 1385 | status = d_revalidate(dentry, nd->flags); |
1390 | if (unlikely(status <= 0)) { | 1386 | if (unlikely(status <= 0)) { |
@@ -1410,11 +1406,6 @@ unlazy: | |||
1410 | if (unlikely(!dentry)) | 1406 | if (unlikely(!dentry)) |
1411 | goto need_lookup; | 1407 | goto need_lookup; |
1412 | 1408 | ||
1413 | if (unlikely(d_need_lookup(dentry))) { | ||
1414 | dput(dentry); | ||
1415 | goto need_lookup; | ||
1416 | } | ||
1417 | |||
1418 | if (unlikely(dentry->d_flags & DCACHE_OP_REVALIDATE) && need_reval) | 1409 | if (unlikely(dentry->d_flags & DCACHE_OP_REVALIDATE) && need_reval) |
1419 | status = d_revalidate(dentry, nd->flags); | 1410 | status = d_revalidate(dentry, nd->flags); |
1420 | if (unlikely(status <= 0)) { | 1411 | if (unlikely(status <= 0)) { |