maple_tree: make the code symmetrical in mas_wr_extend_null()
authorPeng Zhang <zhangpeng.00@bytedance.com>
Wed, 24 May 2023 03:12:42 +0000 (11:12 +0800)
committerAndrew Morton <akpm@linux-foundation.org>
Fri, 9 Jun 2023 23:25:44 +0000 (16:25 -0700)
Just make the code symmetrical to improve readability.

Link: https://lkml.kernel.org/r/20230524031247.65949-6-zhangpeng.00@bytedance.com
Signed-off-by: Peng Zhang <zhangpeng.00@bytedance.com>
Reviewed-by: Liam R. Howlett <Liam.Howlett@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
lib/maple_tree.c

index 41a105e76e22b44121e817bd3ebafc0e8082dd7d..e6e42e1ba44cfea95e37606d7fd1a57c16b13606 100644 (file)
@@ -4264,19 +4264,21 @@ static inline void mas_wr_extend_null(struct ma_wr_state *wr_mas)
 {
        struct ma_state *mas = wr_mas->mas;
 
-       if (mas->last < wr_mas->end_piv && !wr_mas->slots[wr_mas->offset_end])
+       if (!wr_mas->slots[wr_mas->offset_end]) {
+               /* If this one is null, the next and prev are not */
                mas->last = wr_mas->end_piv;
-
-       /* Check next slot(s) if we are overwriting the end */
-       if ((mas->last == wr_mas->end_piv) &&
-           (wr_mas->node_end != wr_mas->offset_end) &&
-           !wr_mas->slots[wr_mas->offset_end + 1]) {
-               wr_mas->offset_end++;
-               if (wr_mas->offset_end == wr_mas->node_end)
-                       mas->last = mas->max;
-               else
-                       mas->last = wr_mas->pivots[wr_mas->offset_end];
-               wr_mas->end_piv = mas->last;
+       } else {
+               /* Check next slot(s) if we are overwriting the end */
+               if ((mas->last == wr_mas->end_piv) &&
+                   (wr_mas->node_end != wr_mas->offset_end) &&
+                   !wr_mas->slots[wr_mas->offset_end + 1]) {
+                       wr_mas->offset_end++;
+                       if (wr_mas->offset_end == wr_mas->node_end)
+                               mas->last = mas->max;
+                       else
+                               mas->last = wr_mas->pivots[wr_mas->offset_end];
+                       wr_mas->end_piv = mas->last;
+               }
        }
 
        if (!wr_mas->content) {