[XFS] implement generic xfs_btree_increment

From: Dave Chinner <dgc@sgi.com>

Because this is the first major generic btree routine this patch includes
some infrastrucure, first a few routines to deal with a btree block that
can be either in short or long form, second xfs_btree_read_buf_block,
which is the new central routine to read a btree block given a cursor, and
third the new xfs_btree_ptr_addr routine to calculate the address for a
given btree pointer record.

[hch: split out from bigger patch and minor adaptions]

SGI-PV: 985583

SGI-Modid: xfs-linux-melb:xfs-kern:32190a

Signed-off-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
Signed-off-by: Bill O'Donnell <billodo@sgi.com>
Signed-off-by: David Chinner <david@fromorbit.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/fs/xfs/xfs_alloc.c b/fs/xfs/xfs_alloc.c
index 69833eb1de4f..b8bb694b7da3 100644
--- a/fs/xfs/xfs_alloc.c
+++ b/fs/xfs/xfs_alloc.c
@@ -818,7 +818,7 @@ xfs_alloc_ag_vextent_near(
                                 XFS_WANT_CORRUPTED_GOTO(i == 1, error0);
                                 if (ltlen >= args->minlen)
                                         break;
-                                if ((error = xfs_alloc_increment(cnt_cur, 0, &i)))
+                                if ((error = xfs_btree_increment(cnt_cur, 0, &i)))
                                         goto error0;
                         } while (i);
                         ASSERT(ltlen >= args->minlen);
@@ -828,7 +828,7 @@ xfs_alloc_ag_vextent_near(
                 i = cnt_cur->bc_ptrs[0];
                 for (j = 1, blen = 0, bdiff = 0;
                      !error && j && (blen < args->maxlen || bdiff > 0);
-                     error = xfs_alloc_increment(cnt_cur, 0, &j)) {
+                     error = xfs_btree_increment(cnt_cur, 0, &j)) {
                         /*
                          * For each entry, decide if it's better than
                          * the previous best entry.
@@ -938,7 +938,7 @@ xfs_alloc_ag_vextent_near(
          * Increment the cursor, so we will point at the entry just right
          * of the leftward entry if any, or to the leftmost entry.
          */
-        if ((error = xfs_alloc_increment(bno_cur_gt, 0, &i)))
+        if ((error = xfs_btree_increment(bno_cur_gt, 0, &i)))
                 goto error0;
         if (!i) {
                 /*
@@ -977,7 +977,7 @@ xfs_alloc_ag_vextent_near(
                                         args->minlen, &gtbnoa, &gtlena);
                         if (gtlena >= args->minlen)
                                 break;
-                        if ((error = xfs_alloc_increment(bno_cur_gt, 0, &i)))
+                        if ((error = xfs_btree_increment(bno_cur_gt, 0, &i)))
                                 goto error0;
                         if (!i) {
                                 xfs_btree_del_cursor(bno_cur_gt,
@@ -1066,7 +1066,7 @@ xfs_alloc_ag_vextent_near(
                                         /*
                                          * Fell off the right end.
                                          */
-                                        if ((error = xfs_alloc_increment(
+                                        if ((error = xfs_btree_increment(
                                                         bno_cur_gt, 0, &i)))
                                                 goto error0;
                                         if (!i) {
@@ -1548,7 +1548,7 @@ xfs_free_ag_extent(
          * Look for a neighboring block on the right (higher block numbers)
          * that is contiguous with this space.
          */
-        if ((error = xfs_alloc_increment(bno_cur, 0, &haveright)))
+        if ((error = xfs_btree_increment(bno_cur, 0, &haveright)))
                 goto error0;
         if (haveright) {
                 /*