xfs: factor out tree fixup logic into helper

Source kernel commit: d29688257fd425f7c64c3525fea29658b50fc390

Lift the btree fixup path into a helper function.

Signed-off-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/include/xfs_trace.h b/include/xfs_trace.h
index 1321545606a0240a85fa05d262ee4971b451184e..5d6828f193121747dcfddaa93ca510e34f05ea1b 100644 (file)
--- a/include/xfs_trace.h
+++ b/include/xfs_trace.h
@@ -9,6 +9,7 @@
 #define trace_xfs_agfl_reset(a,b,c,d)          ((void) 0)
 #define trace_xfs_agfl_free_defer(a,b,c,d,e)   ((void) 0)
 #define trace_xfs_alloc_cur_check(a,b,c,d,e,f) ((void) 0)
+#define trace_xfs_alloc_cur(a)                 ((void) 0)
 #define trace_xfs_alloc_cur_left(a)            ((void) 0)
 #define trace_xfs_alloc_cur_right(a)           ((void) 0)
 #define trace_xfs_alloc_exact_done(a)          ((void) 0)

diff --git a/libxfs/xfs_alloc.c b/libxfs/xfs_alloc.c
index cc281a0127db28637c6fe72de63bee1e3be7dc76..de077f773546c30ad7a7a5e3bf5bdc6a16b65ef7 100644 (file)
--- a/libxfs/xfs_alloc.c
+++ b/libxfs/xfs_alloc.c
@@ -885,6 +885,36 @@ out:
        return 0;
 }
 
+/*
+ * Complete an allocation of a candidate extent. Remove the extent from both
+ * trees and update the args structure.
+ */
+STATIC int
+xfs_alloc_cur_finish(
+       struct xfs_alloc_arg    *args,
+       struct xfs_alloc_cur    *acur)
+{
+       int                     error;
+
+       ASSERT(acur->cnt && acur->bnolt);
+       ASSERT(acur->bno >= acur->rec_bno);
+       ASSERT(acur->bno + acur->len <= acur->rec_bno + acur->rec_len);
+       ASSERT(acur->rec_bno + acur->rec_len <=
+              be32_to_cpu(XFS_BUF_TO_AGF(args->agbp)->agf_length));
+
+       error = xfs_alloc_fixup_trees(acur->cnt, acur->bnolt, acur->rec_bno,
+                                     acur->rec_len, acur->bno, acur->len, 0);
+       if (error)
+               return error;
+
+       args->agbno = acur->bno;
+       args->len = acur->len;
+       args->wasfromfl = 0;
+
+       trace_xfs_alloc_cur(args);
+       return 0;
+}
+
 /*
  * Deal with the case where only small freespaces remain. Either return the
  * contents of the last freespace record, or allocate space from the freelist if
@@ -1354,7 +1384,6 @@ restart:
        } else if (error) {
                goto out;
        }
-       args->wasfromfl = 0;
 
        /*
         * First algorithm.
@@ -1435,15 +1464,8 @@ restart:
        }
 
 alloc:
-       args->agbno = acur.bno;
-       args->len = acur.len;
-       ASSERT(acur.bno >= acur.rec_bno);
-       ASSERT(acur.bno + acur.len <= acur.rec_bno + acur.rec_len);
-       ASSERT(acur.rec_bno + acur.rec_len <=
-              be32_to_cpu(XFS_BUF_TO_AGF(args->agbp)->agf_length));
-
-       error = xfs_alloc_fixup_trees(acur.cnt, acur.bnolt, acur.rec_bno,
-                                     acur.rec_len, acur.bno, acur.len, 0);
+       /* fix up btrees on a successful allocation */
+       error = xfs_alloc_cur_finish(args, &acur);
 
 out:
        xfs_alloc_cur_close(&acur, error);