diff options
author | Marcin Slusarz <marcin.slusarz@gmail.com> | 2008-02-13 18:03:29 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-13 19:21:19 -0500 |
commit | 413d57c9907c72ed608df2be72ef8ed13a3eeb46 (patch) | |
tree | 92f98a1219915d2d72589b24a04232fccf3a40f2 /fs/xfs/xfs_bmap_btree.c | |
parent | 91d35dd93e14c34539a8005183ea500f25caad02 (diff) |
xfs: convert beX_add to beX_add_cpu (new common API)
remove beX_add functions and replace all uses with beX_add_cpu
Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Cc: Mark Fasheh <mark.fasheh@oracle.com>
Reviewed-by: Dave Chinner <dgc@sgi.com>
Cc: Timothy Shimmin <tes@sgi.com>
Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/xfs/xfs_bmap_btree.c')
-rw-r--r-- | fs/xfs/xfs_bmap_btree.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/fs/xfs/xfs_bmap_btree.c b/fs/xfs/xfs_bmap_btree.c index c4181d85605c..bd18987326a3 100644 --- a/fs/xfs/xfs_bmap_btree.c +++ b/fs/xfs/xfs_bmap_btree.c | |||
@@ -631,7 +631,7 @@ xfs_bmbt_delrec( | |||
631 | memcpy(lrp, rrp, numrrecs * sizeof(*lrp)); | 631 | memcpy(lrp, rrp, numrrecs * sizeof(*lrp)); |
632 | xfs_bmbt_log_recs(cur, lbp, numlrecs + 1, numlrecs + numrrecs); | 632 | xfs_bmbt_log_recs(cur, lbp, numlrecs + 1, numlrecs + numrrecs); |
633 | } | 633 | } |
634 | be16_add(&left->bb_numrecs, numrrecs); | 634 | be16_add_cpu(&left->bb_numrecs, numrrecs); |
635 | left->bb_rightsib = right->bb_rightsib; | 635 | left->bb_rightsib = right->bb_rightsib; |
636 | xfs_bmbt_log_block(cur, lbp, XFS_BB_RIGHTSIB | XFS_BB_NUMRECS); | 636 | xfs_bmbt_log_block(cur, lbp, XFS_BB_RIGHTSIB | XFS_BB_NUMRECS); |
637 | if (be64_to_cpu(left->bb_rightsib) != NULLDFSBNO) { | 637 | if (be64_to_cpu(left->bb_rightsib) != NULLDFSBNO) { |
@@ -924,7 +924,7 @@ xfs_bmbt_killroot( | |||
924 | xfs_iroot_realloc(ip, i, cur->bc_private.b.whichfork); | 924 | xfs_iroot_realloc(ip, i, cur->bc_private.b.whichfork); |
925 | block = ifp->if_broot; | 925 | block = ifp->if_broot; |
926 | } | 926 | } |
927 | be16_add(&block->bb_numrecs, i); | 927 | be16_add_cpu(&block->bb_numrecs, i); |
928 | ASSERT(block->bb_numrecs == cblock->bb_numrecs); | 928 | ASSERT(block->bb_numrecs == cblock->bb_numrecs); |
929 | kp = XFS_BMAP_KEY_IADDR(block, 1, cur); | 929 | kp = XFS_BMAP_KEY_IADDR(block, 1, cur); |
930 | ckp = XFS_BMAP_KEY_IADDR(cblock, 1, cur); | 930 | ckp = XFS_BMAP_KEY_IADDR(cblock, 1, cur); |
@@ -947,7 +947,7 @@ xfs_bmbt_killroot( | |||
947 | XFS_TRANS_DQ_BCOUNT, -1L); | 947 | XFS_TRANS_DQ_BCOUNT, -1L); |
948 | xfs_trans_binval(cur->bc_tp, cbp); | 948 | xfs_trans_binval(cur->bc_tp, cbp); |
949 | cur->bc_bufs[level - 1] = NULL; | 949 | cur->bc_bufs[level - 1] = NULL; |
950 | be16_add(&block->bb_level, -1); | 950 | be16_add_cpu(&block->bb_level, -1); |
951 | xfs_trans_log_inode(cur->bc_tp, ip, | 951 | xfs_trans_log_inode(cur->bc_tp, ip, |
952 | XFS_ILOG_CORE | XFS_ILOG_FBROOT(cur->bc_private.b.whichfork)); | 952 | XFS_ILOG_CORE | XFS_ILOG_FBROOT(cur->bc_private.b.whichfork)); |
953 | cur->bc_nlevels--; | 953 | cur->bc_nlevels--; |
@@ -1401,9 +1401,9 @@ xfs_bmbt_rshift( | |||
1401 | key.br_startoff = cpu_to_be64(xfs_bmbt_disk_get_startoff(rrp)); | 1401 | key.br_startoff = cpu_to_be64(xfs_bmbt_disk_get_startoff(rrp)); |
1402 | rkp = &key; | 1402 | rkp = &key; |
1403 | } | 1403 | } |
1404 | be16_add(&left->bb_numrecs, -1); | 1404 | be16_add_cpu(&left->bb_numrecs, -1); |
1405 | xfs_bmbt_log_block(cur, lbp, XFS_BB_NUMRECS); | 1405 | xfs_bmbt_log_block(cur, lbp, XFS_BB_NUMRECS); |
1406 | be16_add(&right->bb_numrecs, 1); | 1406 | be16_add_cpu(&right->bb_numrecs, 1); |
1407 | #ifdef DEBUG | 1407 | #ifdef DEBUG |
1408 | if (level > 0) | 1408 | if (level > 0) |
1409 | xfs_btree_check_key(XFS_BTNUM_BMAP, rkp, rkp + 1); | 1409 | xfs_btree_check_key(XFS_BTNUM_BMAP, rkp, rkp + 1); |
@@ -1535,7 +1535,7 @@ xfs_bmbt_split( | |||
1535 | right->bb_numrecs = cpu_to_be16(be16_to_cpu(left->bb_numrecs) / 2); | 1535 | right->bb_numrecs = cpu_to_be16(be16_to_cpu(left->bb_numrecs) / 2); |
1536 | if ((be16_to_cpu(left->bb_numrecs) & 1) && | 1536 | if ((be16_to_cpu(left->bb_numrecs) & 1) && |
1537 | cur->bc_ptrs[level] <= be16_to_cpu(right->bb_numrecs) + 1) | 1537 | cur->bc_ptrs[level] <= be16_to_cpu(right->bb_numrecs) + 1) |
1538 | be16_add(&right->bb_numrecs, 1); | 1538 | be16_add_cpu(&right->bb_numrecs, 1); |
1539 | i = be16_to_cpu(left->bb_numrecs) - be16_to_cpu(right->bb_numrecs) + 1; | 1539 | i = be16_to_cpu(left->bb_numrecs) - be16_to_cpu(right->bb_numrecs) + 1; |
1540 | if (level > 0) { | 1540 | if (level > 0) { |
1541 | lkp = XFS_BMAP_KEY_IADDR(left, i, cur); | 1541 | lkp = XFS_BMAP_KEY_IADDR(left, i, cur); |
@@ -1562,7 +1562,7 @@ xfs_bmbt_split( | |||
1562 | xfs_bmbt_log_recs(cur, rbp, 1, be16_to_cpu(right->bb_numrecs)); | 1562 | xfs_bmbt_log_recs(cur, rbp, 1, be16_to_cpu(right->bb_numrecs)); |
1563 | *startoff = xfs_bmbt_disk_get_startoff(rrp); | 1563 | *startoff = xfs_bmbt_disk_get_startoff(rrp); |
1564 | } | 1564 | } |
1565 | be16_add(&left->bb_numrecs, -(be16_to_cpu(right->bb_numrecs))); | 1565 | be16_add_cpu(&left->bb_numrecs, -(be16_to_cpu(right->bb_numrecs))); |
1566 | right->bb_rightsib = left->bb_rightsib; | 1566 | right->bb_rightsib = left->bb_rightsib; |
1567 | left->bb_rightsib = cpu_to_be64(args.fsbno); | 1567 | left->bb_rightsib = cpu_to_be64(args.fsbno); |
1568 | right->bb_leftsib = cpu_to_be64(lbno); | 1568 | right->bb_leftsib = cpu_to_be64(lbno); |
@@ -2240,7 +2240,7 @@ xfs_bmbt_newroot( | |||
2240 | bp = xfs_btree_get_bufl(args.mp, cur->bc_tp, args.fsbno, 0); | 2240 | bp = xfs_btree_get_bufl(args.mp, cur->bc_tp, args.fsbno, 0); |
2241 | cblock = XFS_BUF_TO_BMBT_BLOCK(bp); | 2241 | cblock = XFS_BUF_TO_BMBT_BLOCK(bp); |
2242 | *cblock = *block; | 2242 | *cblock = *block; |
2243 | be16_add(&block->bb_level, 1); | 2243 | be16_add_cpu(&block->bb_level, 1); |
2244 | block->bb_numrecs = cpu_to_be16(1); | 2244 | block->bb_numrecs = cpu_to_be16(1); |
2245 | cur->bc_nlevels++; | 2245 | cur->bc_nlevels++; |
2246 | cur->bc_ptrs[level + 1] = 1; | 2246 | cur->bc_ptrs[level + 1] = 1; |