xfs: create a function to query all records in a btree

Source kernel commit: e9a2599a249ed7d31771985aea0e761f5680de64

Create a helper function that will query all records in a btree.
This will be used by the online repair functions to examine every
record in a btree to rebuild a second btree.

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

diff --git a/libxfs/xfs_alloc.c b/libxfs/xfs_alloc.c
index 6edd878dd6c1f78c1e48514eac65acb104d863f0..aee7844480347ac4785c3865487898bae84b24c6 100644 (file)
--- a/libxfs/xfs_alloc.c
+++ b/libxfs/xfs_alloc.c
@@ -2907,3 +2907,18 @@ xfs_alloc_query_range(
        return xfs_btree_query_range(cur, &low_brec, &high_brec,
                        xfs_alloc_query_range_helper, &query);
 }
+
+/* Find all free space records. */
+int
+xfs_alloc_query_all(
+       struct xfs_btree_cur                    *cur,
+       xfs_alloc_query_range_fn                fn,
+       void                                    *priv)
+{
+       struct xfs_alloc_query_range_info       query;
+
+       ASSERT(cur->bc_btnum == XFS_BTNUM_BNO);
+       query.priv = priv;
+       query.fn = fn;
+       return xfs_btree_query_all(cur, xfs_alloc_query_range_helper, &query);
+}

diff --git a/libxfs/xfs_alloc.h b/libxfs/xfs_alloc.h
index 6c2643c4abd3f2f51ea114db23aef89802db5c4c..77d9c27330abc2fbe7dbf192a8d25e8c2352fa17 100644 (file)
--- a/libxfs/xfs_alloc.h
+++ b/libxfs/xfs_alloc.h
@@ -228,5 +228,7 @@ int xfs_alloc_query_range(struct xfs_btree_cur *cur,
                struct xfs_alloc_rec_incore *low_rec,
                struct xfs_alloc_rec_incore *high_rec,
                xfs_alloc_query_range_fn fn, void *priv);
+int xfs_alloc_query_all(struct xfs_btree_cur *cur, xfs_alloc_query_range_fn fn,
+               void *priv);
 
 #endif /* __XFS_ALLOC_H__ */

diff --git a/libxfs/xfs_btree.c b/libxfs/xfs_btree.c
index 1c024419ec63a55b25eacf9c2b6e7e3f685cbd72..7df320d9cd2d2f63935064fa80a15e79f490d41e 100644 (file)
--- a/libxfs/xfs_btree.c
+++ b/libxfs/xfs_btree.c
@@ -4842,6 +4842,21 @@ xfs_btree_query_range(
                        fn, priv);
 }
 
+/* Query a btree for all records. */
+int
+xfs_btree_query_all(
+       struct xfs_btree_cur            *cur,
+       xfs_btree_query_range_fn        fn,
+       void                            *priv)
+{
+       union xfs_btree_irec            low_rec;
+       union xfs_btree_irec            high_rec;
+
+       memset(&low_rec, 0, sizeof(low_rec));
+       memset(&high_rec, 0xFF, sizeof(high_rec));
+       return xfs_btree_query_range(cur, &low_rec, &high_rec, fn, priv);
+}
+
 /*
  * Calculate the number of blocks needed to store a given number of records
  * in a short-format (per-AG metadata) btree.

diff --git a/libxfs/xfs_btree.h b/libxfs/xfs_btree.h
index 35ef62430012340edb41f2efeb3ffbb93ec53137..05cf35b5e60ff944f70e8490ae5ebe15e87e5a5e 100644 (file)
--- a/libxfs/xfs_btree.h
+++ b/libxfs/xfs_btree.h
@@ -496,6 +496,8 @@ typedef int (*xfs_btree_query_range_fn)(struct xfs_btree_cur *cur,
 int xfs_btree_query_range(struct xfs_btree_cur *cur,
                union xfs_btree_irec *low_rec, union xfs_btree_irec *high_rec,
                xfs_btree_query_range_fn fn, void *priv);
+int xfs_btree_query_all(struct xfs_btree_cur *cur, xfs_btree_query_range_fn fn,
+               void *priv);
 
 typedef int (*xfs_btree_visit_blocks_fn)(struct xfs_btree_cur *cur, int level,
                void *data);

diff --git a/libxfs/xfs_rmap.c b/libxfs/xfs_rmap.c
index 7a75e260f238e735ebcfb32dda1eb05bb701da20..7738f50a0f707829dc67af975b03f33ddb450dac 100644 (file)
--- a/libxfs/xfs_rmap.c
+++ b/libxfs/xfs_rmap.c
@@ -1999,14 +1999,14 @@ xfs_rmap_query_range_helper(
 /* Find all rmaps between two keys. */
 int
 xfs_rmap_query_range(
-       struct xfs_btree_cur            *cur,
-       struct xfs_rmap_irec            *low_rec,
-       struct xfs_rmap_irec            *high_rec,
-       xfs_rmap_query_range_fn fn,
-       void                            *priv)
+       struct xfs_btree_cur                    *cur,
+       struct xfs_rmap_irec                    *low_rec,
+       struct xfs_rmap_irec                    *high_rec,
+       xfs_rmap_query_range_fn                 fn,
+       void                                    *priv)
 {
-       union xfs_btree_irec            low_brec;
-       union xfs_btree_irec            high_brec;
+       union xfs_btree_irec                    low_brec;
+       union xfs_btree_irec                    high_brec;
        struct xfs_rmap_query_range_info        query;
 
        low_brec.r = *low_rec;
@@ -2017,6 +2017,20 @@ xfs_rmap_query_range(
                        xfs_rmap_query_range_helper, &query);
 }
 
+/* Find all rmaps. */
+int
+xfs_rmap_query_all(
+       struct xfs_btree_cur                    *cur,
+       xfs_rmap_query_range_fn                 fn,
+       void                                    *priv)
+{
+       struct xfs_rmap_query_range_info        query;
+
+       query.priv = priv;
+       query.fn = fn;
+       return xfs_btree_query_all(cur, xfs_rmap_query_range_helper, &query);
+}
+
 /* Clean up after calling xfs_rmap_finish_one. */
 void
 xfs_rmap_finish_one_cleanup(

diff --git a/libxfs/xfs_rmap.h b/libxfs/xfs_rmap.h
index 789930599339058ed8db437a6ff5be061095877c..faf2c1a2e63be348f7b7ae468b85141acabd1b1d 100644 (file)
--- a/libxfs/xfs_rmap.h
+++ b/libxfs/xfs_rmap.h
@@ -162,6 +162,8 @@ typedef int (*xfs_rmap_query_range_fn)(
 int xfs_rmap_query_range(struct xfs_btree_cur *cur,
                struct xfs_rmap_irec *low_rec, struct xfs_rmap_irec *high_rec,
                xfs_rmap_query_range_fn fn, void *priv);
+int xfs_rmap_query_all(struct xfs_btree_cur *cur, xfs_rmap_query_range_fn fn,
+               void *priv);
 
 enum xfs_rmap_intent_type {
        XFS_RMAP_MAP,