xfs: remove the get*keys and update_keys btree ops pointers

Source kernel commit: 973b83194bf12f7e315aace57ae2096ff7b82360

These are internal btree functions; we don't need them to be
dispatched via function pointers.  Make them static again and
just check the overlapped flag to figure out what we need to
do.  The strategy behind this patch was suggested by Christoph.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Suggested-by: Christoph Hellwig <hch@infradead.org>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/libxfs/xfs_alloc_btree.c b/libxfs/xfs_alloc_btree.c
index 503b46f06e6db6ca7c384914f7cbd2df676ec3cd..f993b87de873d3d254b1e01674bca85a462e636c 100644 (file)
--- a/libxfs/xfs_alloc_btree.c
+++ b/libxfs/xfs_alloc_btree.c
@@ -405,10 +405,6 @@ static const struct xfs_btree_ops xfs_allocbt_ops = {
        .keys_inorder           = xfs_allocbt_keys_inorder,
        .recs_inorder           = xfs_allocbt_recs_inorder,
 #endif
-
-       .get_leaf_keys          = xfs_btree_get_leaf_keys,
-       .get_node_keys          = xfs_btree_get_node_keys,
-       .update_keys            = xfs_btree_update_keys,
 };
 
 /*

diff --git a/libxfs/xfs_bmap_btree.c b/libxfs/xfs_bmap_btree.c
index da721a3e048df8177a75591a8b9248497726c1e1..906983e351a7dc4079fc99946ba0f94cd7047e43 100644 (file)
--- a/libxfs/xfs_bmap_btree.c
+++ b/libxfs/xfs_bmap_btree.c
@@ -760,10 +760,6 @@ static const struct xfs_btree_ops xfs_bmbt_ops = {
        .keys_inorder           = xfs_bmbt_keys_inorder,
        .recs_inorder           = xfs_bmbt_recs_inorder,
 #endif
-
-       .get_leaf_keys          = xfs_btree_get_leaf_keys,
-       .get_node_keys          = xfs_btree_get_node_keys,
-       .update_keys            = xfs_btree_update_keys,
 };
 
 /*

diff --git a/libxfs/xfs_btree.c b/libxfs/xfs_btree.c
index b648a4275850ad9b8dd4ee2f514e06bf0d3512de..939760c72cf7ca797f7899693bc3e1f0e16fcfec 100644 (file)
--- a/libxfs/xfs_btree.c
+++ b/libxfs/xfs_btree.c
@@ -1947,29 +1947,6 @@ error0:
        return error;
 }
 
-/* Determine the low key of a leaf block (simple) */
-void
-xfs_btree_get_leaf_keys(
-       struct xfs_btree_cur    *cur,
-       struct xfs_btree_block  *block,
-       union xfs_btree_key     *key)
-{
-       union xfs_btree_rec     *rec;
-
-       rec = xfs_btree_rec_addr(cur, 1, block);
-       cur->bc_ops->init_key_from_rec(key, rec);
-}
-
-/* Determine the low key of a node block (simple) */
-void
-xfs_btree_get_node_keys(
-       struct xfs_btree_cur    *cur,
-       struct xfs_btree_block  *block,
-       union xfs_btree_key     *key)
-{
-       memcpy(key, xfs_btree_key_addr(cur, 1, block), cur->bc_ops->key_len);
-}
-
 /* Find the high key storage area from a regular key. */
 STATIC union xfs_btree_key *
 xfs_btree_high_key_from_key(
@@ -1981,60 +1958,67 @@ xfs_btree_high_key_from_key(
                        (cur->bc_ops->key_len / 2));
 }
 
-/* Determine the low and high keys of a leaf block (overlapped) */
-void
-xfs_btree_get_leaf_keys_overlapped(
+/* Determine the low (and high if overlapped) keys of a leaf block */
+STATIC void
+xfs_btree_get_leaf_keys(
        struct xfs_btree_cur    *cur,
        struct xfs_btree_block  *block,
        union xfs_btree_key     *key)
 {
-       int                     n;
-       union xfs_btree_rec     *rec;
        union xfs_btree_key     max_hkey;
        union xfs_btree_key     hkey;
+       union xfs_btree_rec     *rec;
        union xfs_btree_key     *high;
+       int                     n;
 
-       ASSERT(cur->bc_flags & XFS_BTREE_OVERLAPPING);
        rec = xfs_btree_rec_addr(cur, 1, block);
        cur->bc_ops->init_key_from_rec(key, rec);
 
-       cur->bc_ops->init_high_key_from_rec(&max_hkey, rec);
-       for (n = 2; n <= xfs_btree_get_numrecs(block); n++) {
-               rec = xfs_btree_rec_addr(cur, n, block);
-               cur->bc_ops->init_high_key_from_rec(&hkey, rec);
-               if (cur->bc_ops->diff_two_keys(cur, &hkey, &max_hkey) > 0)
-                       max_hkey = hkey;
-       }
+       if (cur->bc_flags & XFS_BTREE_OVERLAPPING) {
+
+               cur->bc_ops->init_high_key_from_rec(&max_hkey, rec);
+               for (n = 2; n <= xfs_btree_get_numrecs(block); n++) {
+                       rec = xfs_btree_rec_addr(cur, n, block);
+                       cur->bc_ops->init_high_key_from_rec(&hkey, rec);
+                       if (cur->bc_ops->diff_two_keys(cur, &hkey, &max_hkey)
+                                       > 0)
+                               max_hkey = hkey;
+               }
 
-       high = xfs_btree_high_key_from_key(cur, key);
-       memcpy(high, &max_hkey, cur->bc_ops->key_len / 2);
+               high = xfs_btree_high_key_from_key(cur, key);
+               memcpy(high, &max_hkey, cur->bc_ops->key_len / 2);
+       }
 }
 
-/* Determine the low and high keys of a node block (overlapped) */
-void
-xfs_btree_get_node_keys_overlapped(
+/* Determine the low (and high if overlapped) keys of a node block */
+STATIC void
+xfs_btree_get_node_keys(
        struct xfs_btree_cur    *cur,
        struct xfs_btree_block  *block,
        union xfs_btree_key     *key)
 {
-       int                     n;
        union xfs_btree_key     *hkey;
        union xfs_btree_key     *max_hkey;
        union xfs_btree_key     *high;
+       int                     n;
 
-       ASSERT(cur->bc_flags & XFS_BTREE_OVERLAPPING);
-       memcpy(key, xfs_btree_key_addr(cur, 1, block),
-                       cur->bc_ops->key_len / 2);
-
-       max_hkey = xfs_btree_high_key_addr(cur, 1, block);
-       for (n = 2; n <= xfs_btree_get_numrecs(block); n++) {
-               hkey = xfs_btree_high_key_addr(cur, n, block);
-               if (cur->bc_ops->diff_two_keys(cur, hkey, max_hkey) > 0)
-                       max_hkey = hkey;
-       }
+       if (cur->bc_flags & XFS_BTREE_OVERLAPPING) {
+               memcpy(key, xfs_btree_key_addr(cur, 1, block),
+                               cur->bc_ops->key_len / 2);
+
+               max_hkey = xfs_btree_high_key_addr(cur, 1, block);
+               for (n = 2; n <= xfs_btree_get_numrecs(block); n++) {
+                       hkey = xfs_btree_high_key_addr(cur, n, block);
+                       if (cur->bc_ops->diff_two_keys(cur, hkey, max_hkey) > 0)
+                               max_hkey = hkey;
+               }
 
-       high = xfs_btree_high_key_from_key(cur, key);
-       memcpy(high, max_hkey, cur->bc_ops->key_len / 2);
+               high = xfs_btree_high_key_from_key(cur, key);
+               memcpy(high, max_hkey, cur->bc_ops->key_len / 2);
+       } else {
+               memcpy(key, xfs_btree_key_addr(cur, 1, block),
+                               cur->bc_ops->key_len);
+       }
 }
 
 /* Derive the keys for any btree block. */
@@ -2045,9 +2029,9 @@ xfs_btree_get_keys(
        union xfs_btree_key     *key)
 {
        if (be16_to_cpu(block->bb_level) == 0)
-               cur->bc_ops->get_leaf_keys(cur, block, key);
+               xfs_btree_get_leaf_keys(cur, block, key);
        else
-               cur->bc_ops->get_node_keys(cur, block, key);
+               xfs_btree_get_node_keys(cur, block, key);
 }
 
 /*
@@ -2121,28 +2105,12 @@ __xfs_btree_updkeys(
                xfs_btree_log_keys(cur, bp, ptr, ptr);
                if (level + 1 >= cur->bc_nlevels)
                        break;
-               cur->bc_ops->get_node_keys(cur, block, lkey);
+               xfs_btree_get_node_keys(cur, block, lkey);
        }
 
        return 0;
 }
 
-/*
- * Update all the keys from some level in cursor back to the root, stopping
- * when we find a key pair that don't need updating.
- */
-int
-xfs_btree_update_keys_overlapped(
-       struct xfs_btree_cur    *cur,
-       int                     level)
-{
-       struct xfs_buf          *bp;
-       struct xfs_btree_block  *block;
-
-       block = xfs_btree_get_block(cur, level, &bp);
-       return __xfs_btree_updkeys(cur, level, block, bp, false);
-}
-
 /* Update all the keys from some level in cursor back to the root. */
 STATIC int
 xfs_btree_updkeys_force(
@@ -2159,7 +2127,7 @@ xfs_btree_updkeys_force(
 /*
  * Update the parent keys of the given level, progressing towards the root.
  */
-int
+STATIC int
 xfs_btree_update_keys(
        struct xfs_btree_cur    *cur,
        int                     level)
@@ -2170,20 +2138,21 @@ xfs_btree_update_keys(
        union xfs_btree_key     key;
        int                     ptr;
 
-       ASSERT(!(cur->bc_flags & XFS_BTREE_OVERLAPPING));
+       ASSERT(level >= 0);
+
+       block = xfs_btree_get_block(cur, level, &bp);
+       if (cur->bc_flags & XFS_BTREE_OVERLAPPING)
+               return __xfs_btree_updkeys(cur, level, block, bp, false);
 
        XFS_BTREE_TRACE_CURSOR(cur, XBT_ENTRY);
        XFS_BTREE_TRACE_ARGIK(cur, level, keyp);
 
-       ASSERT(level >= 0);
-
        /*
         * Go up the tree from this level toward the root.
         * At each level, update the key value to the value input.
         * Stop when we reach a level where the cursor isn't pointing
         * at the first entry in the block.
         */
-       block = xfs_btree_get_block(cur, level, &bp);
        xfs_btree_get_keys(cur, block, &key);
        for (level++, ptr = 1; ptr == 1 && level < cur->bc_nlevels; level++) {
 #ifdef DEBUG
@@ -2253,7 +2222,7 @@ xfs_btree_update(
 
        /* Pass new key value up to our parent. */
        if (xfs_btree_needs_key_update(cur, ptr)) {
-               error = cur->bc_ops->update_keys(cur, 0);
+               error = xfs_btree_update_keys(cur, 0);
                if (error)
                        goto error0;
        }
@@ -2443,13 +2412,13 @@ xfs_btree_lshift(
                goto error1;
 
        /* Update the parent keys of the right block. */
-       error = cur->bc_ops->update_keys(cur, level);
+       error = xfs_btree_update_keys(cur, level);
        if (error)
                goto error1;
 
        /* Update the parent high keys of the left block, if needed. */
        if (tcur->bc_flags & XFS_BTREE_OVERLAPPING) {
-               error = tcur->bc_ops->update_keys(tcur, level);
+               error = xfs_btree_update_keys(tcur, level);
                if (error)
                        goto error1;
        }
@@ -2629,13 +2598,13 @@ xfs_btree_rshift(
 
        /* Update the parent high keys of the left block, if needed. */
        if (cur->bc_flags & XFS_BTREE_OVERLAPPING) {
-               error = cur->bc_ops->update_keys(cur, level);
+               error = xfs_btree_update_keys(cur, level);
                if (error)
                        goto error1;
        }
 
        /* Update the parent keys of the right block. */
-       error = cur->bc_ops->update_keys(tcur, level);
+       error = xfs_btree_update_keys(tcur, level);
        if (error)
                goto error1;
 
@@ -2774,7 +2743,7 @@ __xfs_btree_split(
                xfs_btree_log_ptrs(cur, rbp, 1, rrecs);
 
                /* Stash the keys of the new block for later insertion. */
-               cur->bc_ops->get_node_keys(cur, right, key);
+               xfs_btree_get_node_keys(cur, right, key);
        } else {
                /* It's a leaf.  Move records.  */
                union xfs_btree_rec     *lrp;   /* left record pointer */
@@ -2788,7 +2757,7 @@ __xfs_btree_split(
                xfs_btree_log_recs(cur, rbp, 1, rrecs);
 
                /* Stash the keys of the new block for later insertion. */
-               cur->bc_ops->get_leaf_keys(cur, right, key);
+               xfs_btree_get_leaf_keys(cur, right, key);
        }
 
        /*
@@ -2818,7 +2787,7 @@ __xfs_btree_split(
 
        /* Update the parent high keys of the left block, if needed. */
        if (cur->bc_flags & XFS_BTREE_OVERLAPPING) {
-               error = cur->bc_ops->update_keys(cur, level);
+               error = xfs_btree_update_keys(cur, level);
                if (error)
                        goto error0;
        }
@@ -3143,9 +3112,9 @@ xfs_btree_new_root(
                 * Get the keys for the left block's keys and put them directly
                 * in the parent block.  Do the same for the right block.
                 */
-               cur->bc_ops->get_node_keys(cur, left,
+               xfs_btree_get_node_keys(cur, left,
                                xfs_btree_key_addr(cur, 1, new));
-               cur->bc_ops->get_node_keys(cur, right,
+               xfs_btree_get_node_keys(cur, right,
                                xfs_btree_key_addr(cur, 2, new));
        } else {
                /*
@@ -3153,9 +3122,9 @@ xfs_btree_new_root(
                 * directly in the parent block.  Do the same for the right
                 * block.
                 */
-               cur->bc_ops->get_leaf_keys(cur, left,
+               xfs_btree_get_leaf_keys(cur, left,
                        xfs_btree_key_addr(cur, 1, new));
-               cur->bc_ops->get_leaf_keys(cur, right,
+               xfs_btree_get_leaf_keys(cur, right,
                        xfs_btree_key_addr(cur, 2, new));
        }
        xfs_btree_log_keys(cur, nbp, 1, 2);
@@ -3434,7 +3403,7 @@ xfs_btree_insrec(
        if (bp && bp->b_bn != old_bn) {
                xfs_btree_get_keys(cur, block, lkey);
        } else if (xfs_btree_needs_key_update(cur, optr)) {
-               error = cur->bc_ops->update_keys(cur, level);
+               error = xfs_btree_update_keys(cur, level);
                if (error)
                        goto error0;
        }
@@ -3880,7 +3849,7 @@ xfs_btree_delrec(
         * key values above us in the tree.
         */
        if (xfs_btree_needs_key_update(cur, ptr)) {
-               error = cur->bc_ops->update_keys(cur, level);
+               error = xfs_btree_update_keys(cur, level);
                if (error)
                        goto error0;
        }

diff --git a/libxfs/xfs_btree.h b/libxfs/xfs_btree.h
index ac06ce4c112ffe4208ae712a4d7bbf562f848e83..72f8b3c5edd8e5f0928e94f80460985e34af8b22 100644 (file)
--- a/libxfs/xfs_btree.h
+++ b/libxfs/xfs_btree.h
@@ -214,19 +214,6 @@ struct xfs_btree_ops {
                                union xfs_btree_rec *r1,
                                union xfs_btree_rec *r2);
 #endif
-
-       /* derive the low & high keys from the records in a leaf block */
-       void    (*get_leaf_keys)(struct xfs_btree_cur *cur,
-                                struct xfs_btree_block *block,
-                                union xfs_btree_key *key);
-
-       /* derive the low & high keys from the keys in a node block */
-       void    (*get_node_keys)(struct xfs_btree_cur *cur,
-                                struct xfs_btree_block *block,
-                                union xfs_btree_key *key);
-
-       /* update the parent keys of given btree level */
-       int     (*update_keys)(struct xfs_btree_cur *cur, int level);
 };
 
 /*
@@ -527,17 +514,6 @@ bool xfs_btree_sblock_verify(struct xfs_buf *bp, unsigned int max_recs);
 uint xfs_btree_compute_maxlevels(struct xfs_mount *mp, uint *limits,
                                 unsigned long len);
 
-void xfs_btree_get_leaf_keys(struct xfs_btree_cur *cur,
-               struct xfs_btree_block *block, union xfs_btree_key *key);
-void xfs_btree_get_node_keys(struct xfs_btree_cur *cur,
-               struct xfs_btree_block *block, union xfs_btree_key *key);
-int xfs_btree_update_keys(struct xfs_btree_cur *cur, int level);
-void xfs_btree_get_leaf_keys_overlapped(struct xfs_btree_cur *cur,
-               struct xfs_btree_block *block, union xfs_btree_key *key);
-void xfs_btree_get_node_keys_overlapped(struct xfs_btree_cur *cur,
-               struct xfs_btree_block *block, union xfs_btree_key *key);
-int xfs_btree_update_keys_overlapped(struct xfs_btree_cur *cur, int level);
-
 /* return codes */
 #define XFS_BTREE_QUERY_RANGE_CONTINUE 0       /* keep iterating */
 #define XFS_BTREE_QUERY_RANGE_ABORT    1       /* stop iterating */

diff --git a/libxfs/xfs_ialloc_btree.c b/libxfs/xfs_ialloc_btree.c
index 2d4b5c1f546c32c15889ffc8d40d6d6cd2e061a4..c05e155abf06ae1d4144ee1c451601a4fb48ac65 100644 (file)
--- a/libxfs/xfs_ialloc_btree.c
+++ b/libxfs/xfs_ialloc_btree.c
@@ -321,10 +321,6 @@ static const struct xfs_btree_ops xfs_inobt_ops = {
        .keys_inorder           = xfs_inobt_keys_inorder,
        .recs_inorder           = xfs_inobt_recs_inorder,
 #endif
-
-       .get_leaf_keys          = xfs_btree_get_leaf_keys,
-       .get_node_keys          = xfs_btree_get_node_keys,
-       .update_keys            = xfs_btree_update_keys,
 };
 
 static const struct xfs_btree_ops xfs_finobt_ops = {
@@ -346,10 +342,6 @@ static const struct xfs_btree_ops xfs_finobt_ops = {
        .keys_inorder           = xfs_inobt_keys_inorder,
        .recs_inorder           = xfs_inobt_recs_inorder,
 #endif
-
-       .get_leaf_keys          = xfs_btree_get_leaf_keys,
-       .get_node_keys          = xfs_btree_get_node_keys,
-       .update_keys            = xfs_btree_update_keys,
 };
 
 /*

diff --git a/libxfs/xfs_rmap_btree.c b/libxfs/xfs_rmap_btree.c
index 0cdcd215aadcb8f2c0a1ddee32b5fe956666d582..59055a8edaee1da26479668f30c7cf12347cb014 100644 (file)
--- a/libxfs/xfs_rmap_btree.c
+++ b/libxfs/xfs_rmap_btree.c
@@ -451,10 +451,6 @@ static const struct xfs_btree_ops xfs_rmapbt_ops = {
        .keys_inorder           = xfs_rmapbt_keys_inorder,
        .recs_inorder           = xfs_rmapbt_recs_inorder,
 #endif
-
-       .get_leaf_keys          = xfs_btree_get_leaf_keys_overlapped,
-       .get_node_keys          = xfs_btree_get_node_keys_overlapped,
-       .update_keys            = xfs_btree_update_keys_overlapped,
 };
 
 /*