- sync vserver branch: will help future merges

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

diff --git a/fs/xfs/xfs_alloc_btree.c b/fs/xfs/xfs_alloc_btree.c
index 55c405c..e0355a1 100644 (file)
--- a/fs/xfs/xfs_alloc_btree.c
+++ b/fs/xfs/xfs_alloc_btree.c
@@ -209,7 +209,7 @@ xfs_alloc_delrec(
                 * No free extents left.
                 */
                else
-                       INT_ZERO(agf->agf_longest, ARCH_CONVERT);
+                       agf->agf_longest = 0;
                mp->m_perag[INT_GET(agf->agf_seqno, ARCH_CONVERT)].pagf_longest =
                        INT_GET(agf->agf_longest, ARCH_CONVERT);
                xfs_alloc_log_agf(cur->bc_tp, cur->bc_private.a.agbp,
@@ -263,7 +263,7 @@ xfs_alloc_delrec(
                        /*
                         * Update the cursor so there's one fewer level.
                         */
-                       xfs_btree_setbuf(cur, level, 0);
+                       xfs_btree_setbuf(cur, level, NULL);
                        cur->bc_nlevels--;
                } else if (level > 0 &&
                           (error = xfs_alloc_decrement(cur, level, &i)))