diff --git a/[refs] b/[refs] index 4d6ec9c8d90b..5a53ef75e490 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0145acc202ca613b23b5383e55df3c32a92ad1bf +refs/heads/master: 5707c87f20bca9e76969bb4096149de6ef74cbb9 diff --git a/trunk/include/linux/dcache.h b/trunk/include/linux/dcache.h index f1c7eb8461be..4270bedd2308 100644 --- a/trunk/include/linux/dcache.h +++ b/trunk/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 */