summaryrefslogtreecommitdiffstats
path: root/fs/f2fs/hash.c
diff options
context:
space:
mode:
authorLeon Romanovsky <leon@leon.nu>2012-12-27 19:55:46 +0200
committerJaegeuk Kim <jaegeuk.kim@samsung.com>2012-12-28 11:27:53 +0900
commit9836b8b9499cb25ea32cad9fff640eef874c5431 (patch)
treeb7d05ce46e6b1f86aea3794ba7b0eddf9db8c9bd /fs/f2fs/hash.c
parent2b50638decdb9a8585654a5acf1c8ce5962f1951 (diff)
downloadlinux-9836b8b9499cb25ea32cad9fff640eef874c5431.tar.bz2
f2fs: unify string length declarations and usage
This patch is intended to unify string length declarations and usage. There are number of calls to strlen which return size_t object. The size of this object depends on compiler if it will be bigger, equal or even smaller than an unsigned int Signed-off-by: Leon Romanovsky <leon@leon.nu> Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
Diffstat (limited to 'fs/f2fs/hash.c')
-rw-r--r--fs/f2fs/hash.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/fs/f2fs/hash.c b/fs/f2fs/hash.c
index 6977415c52fc..6eb8d269b53b 100644
--- a/fs/f2fs/hash.c
+++ b/fs/f2fs/hash.c
@@ -42,7 +42,7 @@ static void TEA_transform(unsigned int buf[4], unsigned int const in[])
buf[1] += b1;
}
-static void str2hashbuf(const char *msg, int len, unsigned int *buf, int num)
+static void str2hashbuf(const char *msg, size_t len, unsigned int *buf, int num)
{
unsigned pad, val;
int i;
@@ -69,7 +69,7 @@ static void str2hashbuf(const char *msg, int len, unsigned int *buf, int num)
*buf++ = pad;
}
-f2fs_hash_t f2fs_dentry_hash(const char *name, int len)
+f2fs_hash_t f2fs_dentry_hash(const char *name, size_t len)
{
__u32 hash;
f2fs_hash_t f2fs_hash;
@@ -87,11 +87,13 @@ f2fs_hash_t f2fs_dentry_hash(const char *name, int len)
buf[3] = 0x10325476;
p = name;
- while (len > 0) {
+ while (1) {
str2hashbuf(p, len, in, 4);
TEA_transform(buf, in);
- len -= 16;
p += 16;
+ if (len <= 16)
+ break;
+ len -= 16;
}
hash = buf[0];
f2fs_hash = cpu_to_le32(hash & ~F2FS_HASH_COL_BIT);