summaryrefslogtreecommitdiffstats
path: root/fs/dcache.c
diff options
context:
space:
mode:
authorWill Deacon2013-12-12 18:40:21 +0100
committerLinus Torvalds2013-12-12 19:39:01 +0100
commita5c21dcefa1c3d759457a604b3cfc4af29c8713f (patch)
tree6832dfcb836f8d5043ba70f17a0ea9c2c428bc4d /fs/dcache.c
parentMerge tag 'iommu-fixes-for-v3.13-rc4' of git://github.com/awilliam/linux-vfio (diff)
downloadkernel-qcow2-linux-a5c21dcefa1c3d759457a604b3cfc4af29c8713f.tar.gz
kernel-qcow2-linux-a5c21dcefa1c3d759457a604b3cfc4af29c8713f.tar.xz
kernel-qcow2-linux-a5c21dcefa1c3d759457a604b3cfc4af29c8713f.zip
dcache: allow word-at-a-time name hashing with big-endian CPUs
When explicitly hashing the end of a string with the word-at-a-time interface, we have to be careful which end of the word we pick up. On big-endian CPUs, the upper-bits will contain the data we're after, so ensure we generate our masks accordingly (and avoid hashing whatever random junk may have been sitting after the string). This patch adds a new dcache helper, bytemask_from_count, which creates a mask appropriate for the CPU endianness. Cc: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/dcache.c')
-rw-r--r--fs/dcache.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/dcache.c b/fs/dcache.c
index 4bdb300b16e2..6055d61811d3 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -192,7 +192,7 @@ static inline int dentry_string_cmp(const unsigned char *cs, const unsigned char
if (!tcount)
return 0;
}
- mask = ~(~0ul << tcount*8);
+ mask = bytemask_from_count(tcount);
return unlikely(!!((a ^ b) & mask));
}