---

yaml
---
r: 12223
b: refs/heads/master
c: 2b3b6d0
h: refs/heads/master
i:
  12221: 9e808e1
  12219: 659b61f
  12215: 99f0c65
  12207: a4e7cb1
  12191: 8b516ee
  12159: c81bf7b
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cfcbbbd089eadcaa86abb2c0f352e1ab23e16f72
+refs/heads/master: 2b3b6d07f760c61ec0a5e5174d3511abc044b8ea

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 */
 }
 
 /*