summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-05-10 21:37:10 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2012-05-11 04:54:35 +0200
commitee983e89670704b2a05e897b161f2674a42d1508 (patch)
tree51b96ffafd9e2496f8a7cf550245850d5a7a5929
parentvfs: do the careful dentry name access for all dentry_cmp cases (diff)
downloadlinux-ee983e89670704b2a05e897b161f2674a42d1508.tar.xz
linux-ee983e89670704b2a05e897b161f2674a42d1508.zip
vfs: move dentry name length comparison from dentry_cmp() into callers
All callers do want to check the dentry length, but some of them can check the length and the hash together, so doing it in dentry_cmp() can be counter-productive. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--fs/dcache.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/fs/dcache.c b/fs/dcache.c
index 5c09ad7b4a15..e6707a1f72c6 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -192,9 +192,6 @@ static inline int dentry_string_cmp(const unsigned char *cs, const unsigned char
static inline int dentry_cmp(const struct dentry *dentry, const unsigned char *ct, unsigned tcount)
{
- if (dentry->d_name.len != tcount)
- return 1;
-
/*
* Be careful about RCU walk racing with rename:
* use ACCESS_ONCE to fetch the name pointer.
@@ -1464,6 +1461,8 @@ static struct dentry *__d_instantiate_unique(struct dentry *entry,
continue;
if (alias->d_parent != entry->d_parent)
continue;
+ if (alias->d_name.len != len)
+ continue;
if (dentry_cmp(alias, name, len))
continue;
__dget(alias);
@@ -1882,6 +1881,8 @@ seqretry:
}
}
+ if (dentry->d_name.len != len)
+ continue;
if (!dentry_cmp(dentry, str, len))
return dentry;
}
@@ -1984,6 +1985,8 @@ struct dentry *__d_lookup(struct dentry *parent, struct qstr *name)
tlen, tname, name))
goto next;
} else {
+ if (dentry->d_name.len != len)
+ goto next;
if (dentry_cmp(dentry, str, len))
goto next;
}