mm/mmap: Disable maple_tree_verbose and remove mas_retry

Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>

diff --git a/mm/mmap.c b/mm/mmap.c
index 0bac499f0d583effe5d65df41c588f1f3e274a2c..12a134e0d73835a8c808067d9b8add731ac986de 100644 (file)
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -60,7 +60,7 @@
 #define CREATE_TRACE_POINTS
 #include <trace/events/mm_mt.h>
 #define CONFIG_DEBUG_MAPLE_TREE
-#define CONFIG_DEBUG_MAPLE_TREE_VERBOSE
+#undef CONFIG_DEBUG_MAPLE_TREE_VERBOSE
 #define CONFIG_DEBUG_VM_RB 1
 extern void mt_validate(struct maple_tree *mt);
 
@@ -397,7 +397,7 @@ static void __vma_mt_dump(struct mm_struct *mm)
 
        rcu_read_lock();
        mas_for_each(&mas, entry, ULONG_MAX) {
-               if (mas_retry(&mas, entry))
+               if (xa_is_zero(entry))
                        continue;
 
                pr_debug("vma: %lu-%lu\t%lu-%lu\n", entry->vm_start,
@@ -419,7 +419,7 @@ static void validate_mm_mt(struct mm_struct *mm,
        MA_STATE(mas, mt, 0, 0);
        rcu_read_lock();
        mas_for_each(&mas, vma_mt, ULONG_MAX) {
-               if (mas_retry(&mas, vma_mt))
+               if (xa_is_zero(vma_mt))
                        continue;
 
                if (vma && vma == ignore)