From: Nathan Scott <nathans@sgi.com>
Date: Wed, 2 Nov 2005 04:12:28 +0000 (+1100)
Subject: [XFS] Remove an unhelpful ifdef, the comment above the routine explains
X-Git-Tag: MMI-PSA29.97-13-9~54162^2~31^2~13
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2b3b6d07f760c61ec0a5e5174d3511abc044b8ea;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

[XFS] Remove an unhelpful ifdef, the comment above the routine explains
the purpose well enough here.

SGI-PV: 944821
SGI-Modid: xfs-linux:xfs-kern:24214a

Signed-off-by: Nathan Scott <nathans@sgi.com>
---

diff --git a/fs/xfs/xfs_da_btree.c b/fs/xfs/xfs_da_btree.c
index c352d0633c31..6098aff7bd5c 100644
--- a/fs/xfs/xfs_da_btree.c
+++ b/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 */
 }
 
 /*