From c054f345808b894dc2514c992a1c24219f05a043 Mon Sep 17 00:00:00 2001
From: Nathan Scott <nathans@sgi.com>
Date: Wed, 2 Nov 2005 15:12:28 +1100
Subject: [PATCH] --- yaml --- r: 12223 b: refs/heads/master c:
 2b3b6d07f760c61ec0a5e5174d3511abc044b8ea h: refs/heads/master i:   12221:
 9e808e12e7d3f62d27709a26c74d8c35e115b8dd   12219:
 659b61fede00ba226afa19d1ae022c1c17fbd193   12215:
 99f0c65bd28c99de855251a5d82f2ca306b4da72   12207:
 a4e7cb15965f786c18c8c2f50f368d877e8ecfa4   12191:
 8b516eea4340bdd11eccf651d2077c2a168f2dce   12159:
 c81bf7b30e6e42676323e86d4ec4582d44b74b15 v: v3

---
 [refs]                      |  2 +-
 trunk/fs/xfs/xfs_da_btree.c | 14 +-------------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index b9001a0f0da8..68ba737408a3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cfcbbbd089eadcaa86abb2c0f352e1ab23e16f72
+refs/heads/master: 2b3b6d07f760c61ec0a5e5174d3511abc044b8ea
diff --git a/trunk/fs/xfs/xfs_da_btree.c b/trunk/fs/xfs/xfs_da_btree.c
index c352d0633c31..6098aff7bd5c 100644
--- a/trunk/fs/xfs/xfs_da_btree.c
+++ b/trunk/fs/xfs/xfs_da_btree.c
@@ -1592,15 +1592,6 @@ xfs_da_hashname(const uchar_t *name, int namelen)
 {
 	xfs_dahash_t hash;
 
-#ifdef SLOWVERSION
-	/*
-	 * This is the old one-byte-at-a-time version.
-	 */
-	for (hash = 0; namelen > 0; namelen--)
-		hash = *name++ ^ rol32(hash, 7);
-
-	return(hash);
-#else
 	/*
 	 * Do four characters at a time as long as we can.
 	 */
@@ -1619,12 +1610,9 @@ xfs_da_hashname(const uchar_t *name, int namelen)
 		return (name[0] << 7) ^ (name[1] << 0) ^ rol32(hash, 7 * 2);
 	case 1:
 		return (name[0] << 0) ^ rol32(hash, 7 * 1);
-	case 0:
+	default: /* case 0: */
 		return hash;
 	}
-	/* NOTREACHED */
-#endif
-	return 0; /* keep gcc happy */
 }
 
 /*