diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-07 01:41:50 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-07 01:52:40 -0400 |
commit | 830c0f0edca67403d361fe976a25b17356c11f19 (patch) | |
tree | b4bfc71ab9aaff0e8b65403c319dde519dd6f9ef /fs/dcache.c | |
parent | 7cd4767e696123cdb7447fbd7c281eb8c610c8e4 (diff) |
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/dcache.c')
-rw-r--r-- | fs/dcache.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/dcache.c b/fs/dcache.c index c83cae19161e..a88948b8bd17 100644 --- a/fs/dcache.c +++ b/fs/dcache.c | |||
@@ -1729,7 +1729,7 @@ seqretry: | |||
1729 | */ | 1729 | */ |
1730 | if (read_seqcount_retry(&dentry->d_seq, *seq)) | 1730 | if (read_seqcount_retry(&dentry->d_seq, *seq)) |
1731 | goto seqretry; | 1731 | goto seqretry; |
1732 | if (parent->d_flags & DCACHE_OP_COMPARE) { | 1732 | if (unlikely(parent->d_flags & DCACHE_OP_COMPARE)) { |
1733 | if (parent->d_op->d_compare(parent, *inode, | 1733 | if (parent->d_op->d_compare(parent, *inode, |
1734 | dentry, i, | 1734 | dentry, i, |
1735 | tlen, tname, name)) | 1735 | tlen, tname, name)) |