interval_tree: Fix ITSTATIC usage for *_subtree_search()

For consistency with the other function templates, change
_subtree_search_*() to use the user-supplied ITSTATIC rather than the
hard-coded 'static'.

Acked-by: Petr Mladek <pmladek@suse.com>
Tested-by: Joe Lawrence <joe.lawrence@redhat.com>
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>

diff --git a/drivers/infiniband/hw/usnic/usnic_uiom_interval_tree.h b/drivers/infiniband/hw/usnic/usnic_uiom_interval_tree.h
index 1d7fc3226bcadebee1c9dce7a2938da5cae3b8c1..cfb42a8f5768bed9f3ee021b9d3574532c7f11cc 100644 (file)
--- a/drivers/infiniband/hw/usnic/usnic_uiom_interval_tree.h
+++ b/drivers/infiniband/hw/usnic/usnic_uiom_interval_tree.h
@@ -53,6 +53,10 @@ extern void
 usnic_uiom_interval_tree_remove(struct usnic_uiom_interval_node *node,
                                        struct rb_root_cached *root);
 extern struct usnic_uiom_interval_node *
+usnic_uiom_interval_tree_subtree_search(struct usnic_uiom_interval_node *node,
+                                       unsigned long start,
+                                       unsigned long last);
+extern struct usnic_uiom_interval_node *
 usnic_uiom_interval_tree_iter_first(struct rb_root_cached *root,
                                        unsigned long start,
                                        unsigned long last);

diff --git a/include/linux/interval_tree.h b/include/linux/interval_tree.h
index 2b8026a3990645b1db5b6d09c3d7ab48d27d0978..9d5791e9f737af2a0d8888f425f62dda18b5353c 100644 (file)
--- a/include/linux/interval_tree.h
+++ b/include/linux/interval_tree.h
@@ -19,6 +19,10 @@ extern void
 interval_tree_remove(struct interval_tree_node *node,
                     struct rb_root_cached *root);
 
+extern struct interval_tree_node *
+interval_tree_subtree_search(struct interval_tree_node *node,
+                            unsigned long start, unsigned long last);
+
 extern struct interval_tree_node *
 interval_tree_iter_first(struct rb_root_cached *root,
                         unsigned long start, unsigned long last);

diff --git a/include/linux/interval_tree_generic.h b/include/linux/interval_tree_generic.h
index 1b400f26f63d69cd829b792ca9da9f06d7c6d0f9..c5a2fed49eb0d6232a4bad843882aab0bd3e7f1c 100644 (file)
--- a/include/linux/interval_tree_generic.h
+++ b/include/linux/interval_tree_generic.h
@@ -77,7 +77,7 @@ ITSTATIC void ITPREFIX ## _remove(ITSTRUCT *node,                           \
  *   Cond2: start <= ITLAST(node)                                            \
  */                                                                          \
                                                                              \
-static ITSTRUCT *                                                            \
+ITSTATIC ITSTRUCT *                                                          \
 ITPREFIX ## _subtree_search(ITSTRUCT *node, ITTYPE start, ITTYPE last)       \
 {                                                                            \
        while (true) {                                                        \

diff --git a/include/linux/mm.h b/include/linux/mm.h
index d16b33bacc32bc306029dd5f0b4fd51a2d8644d2..04fa27718cd1a924e3c3ca8051b556d262f13350 100644 (file)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -3369,6 +3369,8 @@ void vma_interval_tree_insert_after(struct vm_area_struct *node,
                                    struct rb_root_cached *root);
 void vma_interval_tree_remove(struct vm_area_struct *node,
                              struct rb_root_cached *root);
+struct vm_area_struct *vma_interval_tree_subtree_search(struct vm_area_struct *node,
+                               unsigned long start, unsigned long last);
 struct vm_area_struct *vma_interval_tree_iter_first(struct rb_root_cached *root,
                                unsigned long start, unsigned long last);
 struct vm_area_struct *vma_interval_tree_iter_next(struct vm_area_struct *node,

diff --git a/lib/interval_tree.c b/lib/interval_tree.c
index 324766e9bf637668c97940c7224e3b923b269940..9ceb084b6b4ef94c40703b46f3e2642a4c0664b0 100644 (file)
--- a/lib/interval_tree.c
+++ b/lib/interval_tree.c
@@ -13,6 +13,7 @@ INTERVAL_TREE_DEFINE(struct interval_tree_node, rb,
 
 EXPORT_SYMBOL_GPL(interval_tree_insert);
 EXPORT_SYMBOL_GPL(interval_tree_remove);
+EXPORT_SYMBOL_GPL(interval_tree_subtree_search);
 EXPORT_SYMBOL_GPL(interval_tree_iter_first);
 EXPORT_SYMBOL_GPL(interval_tree_iter_next);
 

diff --git a/tools/include/linux/interval_tree_generic.h b/tools/include/linux/interval_tree_generic.h
index 1b400f26f63d69cd829b792ca9da9f06d7c6d0f9..c5a2fed49eb0d6232a4bad843882aab0bd3e7f1c 100644 (file)
--- a/tools/include/linux/interval_tree_generic.h
+++ b/tools/include/linux/interval_tree_generic.h
@@ -77,7 +77,7 @@ ITSTATIC void ITPREFIX ## _remove(ITSTRUCT *node,                           \
  *   Cond2: start <= ITLAST(node)                                            \
  */                                                                          \
                                                                              \
-static ITSTRUCT *                                                            \
+ITSTATIC ITSTRUCT *                                                          \
 ITPREFIX ## _subtree_search(ITSTRUCT *node, ITTYPE start, ITTYPE last)       \
 {                                                                            \
        while (true) {                                                        \