[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH v2 for-4.21 4/6] radix-tree: drop "root" parameters from radix_tree_node_{alloc,free}()


  • To: "xen-devel@xxxxxxxxxxxxxxxxxxxx" <xen-devel@xxxxxxxxxxxxxxxxxxxx>
  • From: Jan Beulich <jbeulich@xxxxxxxx>
  • Date: Mon, 3 Feb 2025 17:25:55 +0100
  • Autocrypt: addr=jbeulich@xxxxxxxx; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL
  • Cc: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, Roger Pau Monné <roger.pau@xxxxxxxxxx>, Oleksii Kurochko <oleksii.kurochko@xxxxxxxxx>
  • Delivery-date: Mon, 03 Feb 2025 16:26:00 +0000
  • List-id: Xen developer discussion <xen-devel.lists.xenproject.org>

They aren't used anymore.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
---
v2: New.

--- a/xen/common/radix-tree.c
+++ b/xen/common/radix-tree.c
@@ -60,16 +60,14 @@ static void cf_check _rcu_node_free(stru
        xfree(rcu_node);
 }
 
-static struct radix_tree_node *radix_tree_node_alloc(
-       struct radix_tree_root *root)
+static struct radix_tree_node *radix_tree_node_alloc(void)
 {
        struct rcu_node *rcu_node = xzalloc(struct rcu_node);
 
        return rcu_node ? &rcu_node->node : NULL;
 }
 
-static void radix_tree_node_free(
-       struct radix_tree_root *root, struct radix_tree_node *node)
+static void radix_tree_node_free(struct radix_tree_node *node)
 {
        struct rcu_node *rcu_node = container_of(node, struct rcu_node, node);
        call_rcu(&rcu_node->rcu_head, _rcu_node_free);
@@ -104,7 +102,7 @@ static int radix_tree_extend(struct radi
 
        do {
                unsigned int newheight;
-               if (!(node = radix_tree_node_alloc(root)))
+               if (!(node = radix_tree_node_alloc()))
                        return -ENOMEM;
 
                /* Increase the height.  */
@@ -155,7 +153,7 @@ int radix_tree_insert(struct radix_tree_
        while (height > 0) {
                if (slot == NULL) {
                        /* Have to add a child node.  */
-                       if (!(slot = radix_tree_node_alloc(root)))
+                       if (!(slot = radix_tree_node_alloc()))
                                return -ENOMEM;
                        slot->height = height;
                        if (node) {
@@ -574,7 +572,7 @@ static inline void radix_tree_shrink(str
                        *((unsigned long *)&to_free->slots[0]) |=
                                                RADIX_TREE_INDIRECT_PTR;
 
-               radix_tree_node_free(root, to_free);
+               radix_tree_node_free(to_free);
        }
 }
 
@@ -639,7 +637,7 @@ void *radix_tree_delete(struct radix_tre
                 * last reference to it disappears (set NULL, above).
                 */
                if (to_free)
-                       radix_tree_node_free(root, to_free);
+                       radix_tree_node_free(to_free);
 
                if (pathp->node->count) {
                        if (pathp->node == indirect_to_ptr(root->rnode))
@@ -655,7 +653,7 @@ void *radix_tree_delete(struct radix_tre
        root->height = 0;
        root->rnode = NULL;
        if (to_free)
-               radix_tree_node_free(root, to_free);
+               radix_tree_node_free(to_free);
 
 out:
        return slot;
@@ -682,7 +680,7 @@ radix_tree_node_destroy(
                }
        }
 
-       radix_tree_node_free(root, node);
+       radix_tree_node_free(node);
 }
 
 void radix_tree_destroy(




 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.