[PATCH 05/11] IB/hfi1: convert __mmu_int_rb to half closed intervals

[Davidlohr Bueso]

The __mmu_int_rb interval tree really wants [a, b) intervals,
not fully closed as currently. As such convert it to use the new
interval_tree_gen.h.

Cc: Mike Marciniszyn <mike.marcinis...@intel.com>
Cc: Dennis Dalessandro <dennis.dalessan...@intel.com>
Cc: Doug Ledford <dledf...@redhat.com>
Cc: linux-r...@vger.kernel.org
Signed-off-by: Davidlohr Bueso <dbu...@suse.de>
---
 drivers/infiniband/hw/hfi1/mmu_rb.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/drivers/infiniband/hw/hfi1/mmu_rb.c 
b/drivers/infiniband/hw/hfi1/mmu_rb.c
index 14d2a90964c3..fb6382b2d44e 100644
--- a/drivers/infiniband/hw/hfi1/mmu_rb.c
+++ b/drivers/infiniband/hw/hfi1/mmu_rb.c
@@ -47,7 +47,7 @@
 #include <linux/list.h>
 #include <linux/rculist.h>
 #include <linux/mmu_notifier.h>
-#include <linux/interval_tree_generic.h>
+#include <linux/interval_tree_gen.h>
 
 #include "mmu_rb.h"
 #include "trace.h"
@@ -89,7 +89,7 @@ static unsigned long mmu_node_start(struct mmu_rb_node *node)
 
 static unsigned long mmu_node_last(struct mmu_rb_node *node)
 {
-       return PAGE_ALIGN(node->addr + node->len) - 1;
+       return PAGE_ALIGN(node->addr + node->len);
 }
 
 int hfi1_mmu_rb_register(void *ops_arg, struct mm_struct *mm,
@@ -195,13 +195,13 @@ static struct mmu_rb_node *__mmu_rb_search(struct 
mmu_rb_handler *handler,
        trace_hfi1_mmu_rb_search(addr, len);
        if (!handler->ops->filter) {
                node = __mmu_int_rb_iter_first(&handler->root, addr,
-                                              (addr + len) - 1);
+                                              addr + len);
        } else {
                for (node = __mmu_int_rb_iter_first(&handler->root, addr,
-                                                   (addr + len) - 1);
+                                                   addr + len);
                     node;
                     node = __mmu_int_rb_iter_next(node, addr,
-                                                  (addr + len) - 1)) {
+                                                  addr + len)) {
                        if (handler->ops->filter(node, addr, len))
                                return node;
                }
@@ -293,11 +293,10 @@ static int mmu_notifier_range_start(struct mmu_notifier 
*mn,
        bool added = false;
 
        spin_lock_irqsave(&handler->lock, flags);
-       for (node = __mmu_int_rb_iter_first(root, range->start, range->end-1);
+       for (node = __mmu_int_rb_iter_first(root, range->start, range->end);
             node; node = ptr) {
                /* Guard against node removal. */
-               ptr = __mmu_int_rb_iter_next(node, range->start,
-                                            range->end - 1);
+               ptr = __mmu_int_rb_iter_next(node, range->start, range->end);
                trace_hfi1_mmu_mem_invalidate(node->addr, node->len);
                if (handler->ops->invalidate(handler->ops_arg, node)) {
                        __mmu_int_rb_remove(node, root);
-- 
2.16.4