fs/affs: use unsigned int for string lengths

- Some min() were used with different types.

- Create a new variable in __affs_hash_dentry() to process
  affs_check_name()/min() return

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/fs/affs/amigaffs.c b/fs/affs/amigaffs.c
index 511ab6b126183ef807805e556765a3809accbb2f..0836f6fff641b7123cd8688c06ce324edb4942df 100644 (file)
--- a/fs/affs/amigaffs.c
+++ b/fs/affs/amigaffs.c
@@ -508,7 +508,7 @@ affs_check_name(const unsigned char *name, int len, bool notruncate)
 int
 affs_copy_name(unsigned char *bstr, struct dentry *dentry)
 {
-       int len = min(dentry->d_name.len, 30u);
+       u32 len = min(dentry->d_name.len, 30u);
 
        *bstr++ = len;
        memcpy(bstr, dentry->d_name.name, len);

diff --git a/fs/affs/namei.c b/fs/affs/namei.c
index de84f4d3e9eccdfee1381a80aca9552a3d506809..66c6cb349bf65c1fb2b0a1d2fa9a887012f65cde 100644 (file)
--- a/fs/affs/namei.c
+++ b/fs/affs/namei.c
@@ -64,15 +64,16 @@ __affs_hash_dentry(struct qstr *qstr, toupper_t toupper, bool notruncate)
 {
        const u8 *name = qstr->name;
        unsigned long hash;
-       int i;
+       int retval;
+       u32 len;
 
-       i = affs_check_name(qstr->name, qstr->len, notruncate);
-       if (i)
-               return i;
+       retval = affs_check_name(qstr->name, qstr->len, notruncate);
+       if (retval)
+               return retval;
 
        hash = init_name_hash();
-       i = min(qstr->len, 30u);
-       for (; i > 0; name++, i--)
+       len = min(qstr->len, 30u);
+       for (; len > 0; name++, len--)
                hash = partial_name_hash(toupper(*name), hash);
        qstr->hash = end_name_hash(hash);
 
@@ -173,7 +174,7 @@ int
 affs_hash_name(struct super_block *sb, const u8 *name, unsigned int len)
 {
        toupper_t toupper = affs_get_toupper(sb);
-       int hash;
+       u32 hash;
 
        hash = len = min(len, 30u);
        for (; len > 0; len--)