aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Piotrowski <michal.k.k.piotrowski@gmail.com>2007-08-23 02:20:10 -0400
committerTim Shimmin <tes@chook.melbourne.sgi.com>2007-10-15 02:47:32 -0400
commitddc6d3b32a8a732c343dc225048fae06c129e48a (patch)
tree989a28da426ea1f33dad18a0f7b2dc2f362b4b72
parent948c6d4fd894d9c7f9ad764cedbe443aa866def2 (diff)
[XFS] Fix build regression from mod/commit which did cleanup of xfs_bmbt_*set_allf
In sgi mod# xfs-linux-melb:xfs-kern:29319a, the variable renaming was not complete and variable 'b' was left unchanged for non-lbd 32 bit machines. SGI-PV: 968563 SGI-Modid: xfs-linux-melb:xfs-kern:29469a Signed-off-by: Michal Piotrowski <michal.k.k.piotrowski@gmail.com> Signed-off-by: Tim Shimmin <tes@sgi.com>
-rw-r--r--fs/xfs/xfs_bmap_btree.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_bmap_btree.c b/fs/xfs/xfs_bmap_btree.c
index 41092a2ea917..32b49ec00fb5 100644
--- a/fs/xfs/xfs_bmap_btree.c
+++ b/fs/xfs/xfs_bmap_btree.c
@@ -2309,7 +2309,7 @@ xfs_bmbt_set_allf(
2309 ((xfs_bmbt_rec_base_t)blockcount & 2309 ((xfs_bmbt_rec_base_t)blockcount &
2310 (xfs_bmbt_rec_base_t)XFS_MASK64LO(21)); 2310 (xfs_bmbt_rec_base_t)XFS_MASK64LO(21));
2311#else /* !XFS_BIG_BLKNOS */ 2311#else /* !XFS_BIG_BLKNOS */
2312 if (ISNULLSTARTBLOCK(b)) { 2312 if (ISNULLSTARTBLOCK(startblock)) {
2313 r->l0 = ((xfs_bmbt_rec_base_t)extent_flag << 63) | 2313 r->l0 = ((xfs_bmbt_rec_base_t)extent_flag << 63) |
2314 ((xfs_bmbt_rec_base_t)startoff << 9) | 2314 ((xfs_bmbt_rec_base_t)startoff << 9) |
2315 (xfs_bmbt_rec_base_t)XFS_MASK64LO(9); 2315 (xfs_bmbt_rec_base_t)XFS_MASK64LO(9);
@@ -2369,7 +2369,7 @@ xfs_bmbt_disk_set_allf(
2369 ((xfs_bmbt_rec_base_t)blockcount & 2369 ((xfs_bmbt_rec_base_t)blockcount &
2370 (xfs_bmbt_rec_base_t)XFS_MASK64LO(21))); 2370 (xfs_bmbt_rec_base_t)XFS_MASK64LO(21)));
2371#else /* !XFS_BIG_BLKNOS */ 2371#else /* !XFS_BIG_BLKNOS */
2372 if (ISNULLSTARTBLOCK(b)) { 2372 if (ISNULLSTARTBLOCK(startblock)) {
2373 r->l0 = cpu_to_be64( 2373 r->l0 = cpu_to_be64(
2374 ((xfs_bmbt_rec_base_t)extent_flag << 63) | 2374 ((xfs_bmbt_rec_base_t)extent_flag << 63) |
2375 ((xfs_bmbt_rec_base_t)startoff << 9) | 2375 ((xfs_bmbt_rec_base_t)startoff << 9) |