LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH v2 1/6 linux-next] FS/AFFS: use unsigned int for string lengths
@ 2015-02-05 19:05 Fabian Frederick
  2015-02-05 19:05 ` [PATCH v2 2/6 linux-next] define AFFSNAMEMAX to replace constant use Fabian Frederick
                   ` (4 more replies)
  0 siblings, 5 replies; 6+ messages in thread
From: Fabian Frederick @ 2015-02-05 19:05 UTC (permalink / raw)
  To: linux-kernel; +Cc: Fabian Frederick, Andrew Morton

-Some min() were used with different types.
-Create a new variable in __affs_hash_dentry()
 to process affs_check_name()/min() return

Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Fabian Frederick <fabf@skynet.be>
---
v2:
   min() variables uniformization
   (suggested by Andrew Morton)

 fs/affs/amigaffs.c |  2 +-
 fs/affs/namei.c    | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/fs/affs/amigaffs.c b/fs/affs/amigaffs.c
index 511ab6b..0836f6f 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)
 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 de84f4d..66c6cb3 100644
--- 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--)
-- 
2.1.0


^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2015-02-05 19:06 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-02-05 19:05 [PATCH v2 1/6 linux-next] FS/AFFS: use unsigned int for string lengths Fabian Frederick
2015-02-05 19:05 ` [PATCH v2 2/6 linux-next] define AFFSNAMEMAX to replace constant use Fabian Frederick
2015-02-05 19:05 ` [PATCH v2 3/6 linux-next] fs/affs/amigaffs.c: remove else after return Fabian Frederick
2015-02-05 19:05 ` [PATCH v2 4/6 linux-next] fs/affs/bitmap.c: remove unnecessary return Fabian Frederick
2015-02-05 19:05 ` [PATCH v2 5/6 linux-next] fs/affs/inode.c: remove double extern affs_symlink_inode_operations Fabian Frederick
2015-02-05 19:05 ` [PATCH v2 6/6 linux-next] fs/affs/super.c: fix switch indentation Fabian Frederick

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).