aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorNathan Scott <nathans@sgi.com>2006-06-19 08:40:12 +1000
committerNathan Scott <nathans@sgi.com>2006-06-19 08:40:12 +1000
commit6fe90e6d1451a05db37b2a582410ddcb45af3606 (patch)
tree9eb884a4928582a563b835809bb6fc8d9786a3a0 /fs
parent[XFS] Push some common code out of write path into core XFS code for (diff)
downloadlinux-dev-6fe90e6d1451a05db37b2a582410ddcb45af3606.tar.xz
linux-dev-6fe90e6d1451a05db37b2a582410ddcb45af3606.zip
[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>
Diffstat (limited to 'fs')
-rw-r--r--fs/xfs/xfs_bmap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c
index 3050b4c647c0..4d0ca14039af 100644
--- a/fs/xfs/xfs_bmap.c
+++ b/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 {