]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
maple_tree: remove sanity check from mas_wr_slot_store()
authorWei Yang <richard.weiyang@gmail.com>
Thu, 17 Oct 2024 01:58:09 +0000 (01:58 +0000)
committerAndrew Morton <akpm@linux-foundation.org>
Thu, 7 Nov 2024 04:11:16 +0000 (20:11 -0800)
After commit 5d659bbb52a2 ("maple_tree: introduce mas_wr_store_type()"),
the check here is redundant.

Let's remove it.

Link: https://lkml.kernel.org/r/20241017015809.23392-3-richard.weiyang@gmail.com
Signed-off-by: Wei Yang <richard.weiyang@gmail.com>
Reviewed-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
Reviewed-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
Cc: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
lib/maple_tree.c

index bc30e99d6cf0ced6f2028655107363be02e7ffc2..38aa8abf8eb81c6b537866a1219e7e3bd460f1b9 100644 (file)
@@ -3897,7 +3897,8 @@ static inline void mas_wr_slot_store(struct ma_wr_state *wr_mas)
                        wr_mas->pivots[offset] = mas->index - 1;
                        mas->offset++; /* Keep mas accurate. */
                }
-       } else if (!mt_in_rcu(mas->tree)) {
+       } else {
+               WARN_ON_ONCE(mt_in_rcu(mas->tree));
                /*
                 * Expand the range, only partially overwriting the previous and
                 * next ranges
@@ -3907,8 +3908,6 @@ static inline void mas_wr_slot_store(struct ma_wr_state *wr_mas)
                wr_mas->pivots[offset] = mas->index - 1;
                wr_mas->pivots[offset + 1] = mas->last;
                mas->offset++; /* Keep mas accurate. */
-       } else {
-               return;
        }
 
        trace_ma_write(__func__, mas, 0, wr_mas->entry);