powerpc/embedded6xx: Update defconfigs

[linux-2.6-omap-h63xx.git] / fs / xfs / xfs_alloc_btree.c

diff --git a/fs/xfs/xfs_alloc_btree.c b/fs/xfs/xfs_alloc_btree.c
index 6ff27b75b93f8064d4b5b3e3f45625d6db9a3d43..733cb75a8c5d956b96743f4b67c6a654850a366a 100644 (file)
--- a/fs/xfs/xfs_alloc_btree.c
+++ b/fs/xfs/xfs_alloc_btree.c
@@ -179,7 +179,7 @@ xfs_allocbt_update_lastrec(
                if (numrecs) {
                        xfs_alloc_rec_t *rrp;
 
-                       rrp = XFS_ALLOC_REC_ADDR(block, numrecs, cur);
+                       rrp = XFS_ALLOC_REC_ADDR(cur->bc_mp, block, numrecs);
                        len = rrp->ar_blockcount;
                } else {
                        len = 0;
@@ -490,7 +490,7 @@ xfs_allocbt_maxrecs(
        int                     blocklen,
        int                     leaf)
 {
-       blocklen -= sizeof(struct xfs_btree_sblock);
+       blocklen -= XFS_ALLOC_BLOCK_LEN(mp);
 
        if (leaf)
                return blocklen / sizeof(xfs_alloc_rec_t);