commit 6fe90e6d1451a05db37b2a582410ddcb45af3606
author Nathan Scott <nathans@sgi.com> Mon Jun 19 08:40:12 2006 +1000
committer Nathan Scott <nathans@sgi.com> Mon Jun 19 08:40:12 2006 +1000
tree 9eb884a4928582a563b835809bb6fc8d9786a3a0
parent 1e69dd0eb354d6f1a77098a3946b5ba57d4e3109

[XFS] Remove an incorrect use of unlikely() on a relatively likely code
path.

SGI-PV: 904196
SGI-Modid: xfs-linux-melb:xfs-kern:26249a

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

fs/xfs/xfs_bmap.c

diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c
index 3050b4c..4d0ca14 100644
--- a/fs/xfs/xfs_bmap.c
+++ b/fs/xfs/xfs_bmap.c
@@ -2834,7 +2834,7 @@
 		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 {