summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-08-06 22:41:50 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-08-06 22:52:40 -0700
commit830c0f0edca67403d361fe976a25b17356c11f19 (patch)
treeb4bfc71ab9aaff0e8b65403c319dde519dd6f9ef /fs
parent7cd4767e696123cdb7447fbd7c281eb8c610c8e4 (diff)
downloadop-kernel-dev-830c0f0edca67403d361fe976a25b17356c11f19.zip
op-kernel-dev-830c0f0edca67403d361fe976a25b17356c11f19.tar.gz
vfs: renumber DCACHE_xyz flags, remove some stale ones
Gcc tends to generate better code with small integers, including the DCACHE_xyz flag tests - so move the common ones to be first in the list. Also just remove the unused DCACHE_INOTIFY_PARENT_WATCHED and DCACHE_AUTOFS_PENDING values, their users no longer exists in the source tree. And add a "unlikely()" to the DCACHE_OP_COMPARE test, since we want the common case to be a nice straight-line fall-through. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/dcache.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/dcache.c b/fs/dcache.c
index c83cae1..a88948b 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -1729,7 +1729,7 @@ seqretry:
*/
if (read_seqcount_retry(&dentry->d_seq, *seq))
goto seqretry;
- if (parent->d_flags & DCACHE_OP_COMPARE) {
+ if (unlikely(parent->d_flags & DCACHE_OP_COMPARE)) {
if (parent->d_op->d_compare(parent, *inode,
dentry, i,
tlen, tname, name))
OpenPOWER on IntegriCloud