diff options
author | Fabian Frederick <fabf@skynet.be> | 2015-02-17 16:46:20 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-17 17:34:52 -0500 |
commit | eeb36f8e938d151fc5e12e96ae13d0e283be357e (patch) | |
tree | f7c9cc24c84059586ff5c51f41a5fa8ce3e45df5 /fs/affs/amigaffs.c | |
parent | 4d29e571e1942f8f418bf776af0134a9cb5a35c9 (diff) |
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>
Diffstat (limited to 'fs/affs/amigaffs.c')
-rw-r--r-- | fs/affs/amigaffs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/affs/amigaffs.c b/fs/affs/amigaffs.c index 511ab6b12618..0836f6fff641 100644 --- 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) | |||
508 | int | 508 | int |
509 | affs_copy_name(unsigned char *bstr, struct dentry *dentry) | 509 | affs_copy_name(unsigned char *bstr, struct dentry *dentry) |
510 | { | 510 | { |
511 | int len = min(dentry->d_name.len, 30u); | 511 | u32 len = min(dentry->d_name.len, 30u); |
512 | 512 | ||
513 | *bstr++ = len; | 513 | *bstr++ = len; |
514 | memcpy(bstr, dentry->d_name.name, len); | 514 | memcpy(bstr, dentry->d_name.name, len); |