From 8b2567f3ba55310f616bb96e7948e4587020bae3 Mon Sep 17 00:00:00 2001
From: Nathan Scott <nathans@sgi.com>
Date: Mon, 19 Jun 2006 08:40:12 +1000
Subject: [PATCH] --- yaml --- r: 28442 b: refs/heads/master c:
 6fe90e6d1451a05db37b2a582410ddcb45af3606 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index e9d2037e9d00..ff7897635415 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e69dd0eb354d6f1a77098a3946b5ba57d4e3109
+refs/heads/master: 6fe90e6d1451a05db37b2a582410ddcb45af3606
diff --git a/trunk/fs/xfs/xfs_bmap.c b/trunk/fs/xfs/xfs_bmap.c
index 3050b4c647c0..4d0ca14039af 100644
--- a/trunk/fs/xfs/xfs_bmap.c
+++ b/trunk/fs/xfs/xfs_bmap.c
@@ -2834,7 +2834,7 @@ xfs_bmap_btalloc(
 		args.prod = ap->ip->i_d.di_extsize;
 		if ((args.mod = (xfs_extlen_t)do_mod(ap->off, args.prod)))
 			args.mod = (xfs_extlen_t)(args.prod - args.mod);
-	} else if (unlikely(mp->m_sb.sb_blocksize >= NBPP)) {
+	} else if (mp->m_sb.sb_blocksize >= NBPP) {
 		args.prod = 1;
 		args.mod = 0;
 	} else {