From 6451cbde54115b0f509b30ea93be0f946dfed91d Mon Sep 17 00:00:00 2001
From: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Date: Sun, 30 Oct 2005 15:03:49 -0800
Subject: [PATCH] --- yaml --- r: 11921 b: refs/heads/master c:
 451cbaa1c328082832a8fbcc427cd4416c602c5a h: refs/heads/master i:   11919:
 ad7bdc42cc2f8d77b4f55985ccb974fa5e61ddc9 v: v3

---
 [refs]                         |  2 +-
 trunk/fs/fat/dir.c             | 10 ++--------
 trunk/fs/vfat/namei.c          |  3 +--
 trunk/include/linux/msdos_fs.h | 11 +++++++++++
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 7547e214fbb1..5ade526c6397 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e57b6817880946a3a78d5d8cad1ace363f7e449
+refs/heads/master: 451cbaa1c328082832a8fbcc427cd4416c602c5a
diff --git a/trunk/fs/fat/dir.c b/trunk/fs/fat/dir.c
index 895049b2ac9c..204d8614406f 100644
--- a/trunk/fs/fat/dir.c
+++ b/trunk/fs/fat/dir.c
@@ -263,7 +263,6 @@ int fat_search_long(struct inode *inode, const unsigned char *name,
 			unsigned char id;
 			unsigned char slot;
 			unsigned char slots;
-			unsigned char sum;
 			unsigned char alias_checksum;
 
 			if (!unicode) {
@@ -317,9 +316,7 @@ int fat_search_long(struct inode *inode, const unsigned char *name,
 				goto parse_long;
 			if (IS_FREE(de->name) || (de->attr & ATTR_VOLUME))
 				continue;
-			for (sum = 0, i = 0; i < 11; i++)
-				sum = (((sum&1)<<7)|((sum&0xfe)>>1)) + de->name[i];
-			if (sum != alias_checksum)
+			if (fat_checksum(de->name) != alias_checksum)
 				nr_slots = 0;
 		}
 
@@ -479,7 +476,6 @@ static int fat_readdirx(struct inode *inode, struct file *filp, void *dirent,
 		unsigned char id;
 		unsigned char slot;
 		unsigned char slots;
-		unsigned char sum;
 		unsigned char alias_checksum;
 
 		if (!unicode) {
@@ -534,9 +530,7 @@ static int fat_readdirx(struct inode *inode, struct file *filp, void *dirent,
 			goto ParseLong;
 		if (IS_FREE(de->name) || (de->attr & ATTR_VOLUME))
 			goto RecEnd;
-		for (sum = 0, i = 0; i < 11; i++)
-			sum = (((sum&1)<<7)|((sum&0xfe)>>1)) + de->name[i];
-		if (sum != alias_checksum)
+		if (fat_checksum(de->name) != alias_checksum)
 			long_slots = 0;
 	}
 
diff --git a/trunk/fs/vfat/namei.c b/trunk/fs/vfat/namei.c
index 1c6f6b57ef1c..467346b123d9 100644
--- a/trunk/fs/vfat/namei.c
+++ b/trunk/fs/vfat/namei.c
@@ -621,8 +621,7 @@ static int vfat_build_slots(struct inode *dir, const unsigned char *name,
 	}
 
 	/* build the entry of long file name */
-	for (cksum = i = 0; i < 11; i++)
-		cksum = (((cksum&1)<<7)|((cksum&0xfe)>>1)) + msdos_name[i];
+	cksum = fat_checksum(msdos_name);
 
 	*nr_slots = usize / 13;
 	for (ps = slots, i = *nr_slots; i > 0; i--, ps++) {
diff --git a/trunk/include/linux/msdos_fs.h b/trunk/include/linux/msdos_fs.h
index 9a3d27257984..941da5c016a0 100644
--- a/trunk/include/linux/msdos_fs.h
+++ b/trunk/include/linux/msdos_fs.h
@@ -282,6 +282,17 @@ static inline u8 fat_attr(struct inode *inode)
 		MSDOS_I(inode)->i_attrs;
 }
 
+static inline unsigned char fat_checksum(const __u8 *name)
+{
+	unsigned char s = name[0];
+	s = (s<<7) + (s>>1) + name[1];	s = (s<<7) + (s>>1) + name[2];
+	s = (s<<7) + (s>>1) + name[3];	s = (s<<7) + (s>>1) + name[4];
+	s = (s<<7) + (s>>1) + name[5];	s = (s<<7) + (s>>1) + name[6];
+	s = (s<<7) + (s>>1) + name[7];	s = (s<<7) + (s>>1) + name[8];
+	s = (s<<7) + (s>>1) + name[9];	s = (s<<7) + (s>>1) + name[10];
+	return s;
+}
+
 static inline sector_t fat_clus_to_blknr(struct msdos_sb_info *sbi, int clus)
 {
 	return ((sector_t)clus - FAT_START_ENT) * sbi->sec_per_clus