projects/linux·commit 5707c87f

vfs: clarify and clean up dentry_cmp()

5707c87f · Linus Torvalds <[email protected]> · 2012-03-02 14:47:15 -08:00

It did some odd things for unclear reasons.  As this is one of the
functions that gets changed when doing word-at-a-time compares, this is
yet another of the "don't change any semantics, but clean things up so
that subsequent patches don't get obscured by the cleanups".

Signed-off-by: Linus Torvalds <[email protected]>
Commit
5707c87f20bca9e76969bb4096149de6ef74cbb9
Parents
0145acc2

Changes

1 files changed · +4 −5

FileStatusAddDelContent
include/linux/dcache.hmodified+4−5View file

include/linux/dcache.h

View file
diff --git a/include/linux/dcache.h b/include/linux/dcache.h
index f1c7eb8..4270bed 100644
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
@@ -54,18 +54,17 @@ extern struct dentry_stat_t dentry_stat;
static inline int dentry_cmp(const unsigned char *cs, size_t scount,
const unsigned char *ct, size_t tcount)
{
- int ret;
if (scount != tcount)
return 1;
+
do {
- ret = (*cs != *ct);
- if (ret)
- break;
+ if (*cs != *ct)
+ return 1;
cs++;
ct++;
tcount--;
} while (tcount);
- return ret;
+ return 0;
}
/* Name hashing routines. Initial hash value */