]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
maple_tree: Don't check lockdep on things that may just be readers
authorLiam R. Howlett <Liam.Howlett@Oracle.com>
Thu, 10 Sep 2020 00:17:43 +0000 (20:17 -0400)
committerLiam R. Howlett <Liam.Howlett@Oracle.com>
Fri, 30 Oct 2020 19:11:35 +0000 (15:11 -0400)
Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
lib/maple_tree.c

index f72e24d2db3e8ffdc4454147fd4256cd9240fbdd..b91c391f82eab5aa18f8503e4980c87860caa430 100644 (file)
@@ -589,8 +589,7 @@ static inline struct maple_enode *mas_get_slot(struct ma_state *mas,
        void **slots = ma_get_slots(mte_to_node(mas->node),
                                    mte_node_type(mas->node));
        if (mt_in_rcu(mas->tree))
-               return rcu_dereference_check(slots[offset],
-                                       lockdep_is_held(mas->tree->ma_lock));
+               return rcu_dereference(slots[offset]);
        else
                return slots[offset];
 }
@@ -1182,8 +1181,7 @@ static inline unsigned long mas_first_node(struct ma_state *mas,
                if (pivot > limit)
                        goto no_entry;
 
-               mn = rcu_dereference_check(slots[offset],
-                               lockdep_is_held(mas->tree->ma_lock));
+               mn = rcu_dereference(slots[offset]);
                if (!mn) {
                        min = pivot + 1;
                        continue;