]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
maple_tree: remove repeated sanity checks from write helper functions
authorSidhartha Kumar <sidhartha.kumar@oracle.com>
Wed, 14 Aug 2024 16:19:42 +0000 (12:19 -0400)
committerAndrew Morton <akpm@linux-foundation.org>
Mon, 2 Sep 2024 03:26:17 +0000 (20:26 -0700)
These sanity checks are now redundant as they are already checked in
mas_wr_store_type(). We can remove them from mas_wr_append() and
mas_wr_node_store().

Link: https://lkml.kernel.org/r/20240814161944.55347-16-sidhartha.kumar@oracle.com
Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
Cc: Liam R. Howlett <Liam.Howlett@oracle.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Suren Baghdasaryan <surenb@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
lib/maple_tree.c

index 5f79be184377fb7a6585177a3a035017a2971fea..8c1a1a48339582b0f507f1aaf529d2142f851977 100644 (file)
@@ -3816,11 +3816,6 @@ static inline bool mas_wr_node_store(struct ma_wr_state *wr_mas,
        unsigned char copy_size, node_pivots = mt_pivots[wr_mas->type];
        bool in_rcu = mt_in_rcu(mas->tree);
 
-       /* Check if there is enough data. The room is enough. */
-       if (!mte_is_root(mas->node) && (new_end < mt_min_slots[wr_mas->type]) &&
-           !(mas->mas_flags & MA_STATE_BULK))
-               return false;
-
        if (mas->last == wr_mas->end_piv)
                offset_end++; /* don't copy this offset */
        else if (unlikely(wr_mas->r_max == ULONG_MAX))
@@ -4018,17 +4013,9 @@ static inline unsigned char mas_wr_new_end(struct ma_wr_state *wr_mas)
 static inline bool mas_wr_append(struct ma_wr_state *wr_mas,
                unsigned char new_end)
 {
-       struct ma_state *mas;
+       struct ma_state *mas = wr_mas->mas;
        void __rcu **slots;
-       unsigned char end;
-
-       mas = wr_mas->mas;
-       if (mt_in_rcu(mas->tree))
-               return false;
-
-       end = mas->end;
-       if (mas->offset != end)
-               return false;
+       unsigned char end = mas->end;
 
        if (new_end < mt_pivots[wr_mas->type]) {
                wr_mas->pivots[new_end] = wr_mas->pivots[end];