From: Peng Zhang <zhangpeng.00@bytedance.com>
To: Liam.Howlett@oracle.com
Cc: akpm@linux-foundation.org, linux-mm@kvack.org,
linux-kernel@vger.kernel.org, maple-tree@lists.infradead.org,
Peng Zhang <zhangpeng.00@bytedance.com>
Subject: [PATCH 8/9] maple_tree: Remove the redundant check of mas->offset in mas_empty_area/area_rev()
Date: Tue, 25 Apr 2023 19:05:10 +0800 [thread overview]
Message-ID: <20230425110511.11680-9-zhangpeng.00@bytedance.com> (raw)
In-Reply-To: <20230425110511.11680-1-zhangpeng.00@bytedance.com>
In mas_empty_area(), after mas_awalk() returns, if EBUSY is not set,
then mas->offset must be valid, no need to check. Same in
mas_empty_area_rev(), so delete it.
Signed-off-by: Peng Zhang <zhangpeng.00@bytedance.com>
---
lib/maple_tree.c | 7 -------
1 file changed, 7 deletions(-)
diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index 8bfa837b7b752..964214de2ed18 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -5305,13 +5305,9 @@ int mas_empty_area(struct ma_state *mas, unsigned long min,
return xa_err(mas->node);
offset = mas->offset;
- if (unlikely(offset == MAPLE_NODE_SLOTS))
- return -EBUSY;
-
mt = mte_node_type(mas->node);
pivots = ma_pivots(mas_mn(mas), mt);
mas->index = max(mas->index, mas_safe_min(mas, pivots, offset));
-
mas->last = mas->index + size - 1;
return 0;
}
@@ -5365,9 +5361,6 @@ int mas_empty_area_rev(struct ma_state *mas, unsigned long min,
if (mas_is_err(mas))
return xa_err(mas->node);
- if (unlikely(mas->offset == MAPLE_NODE_SLOTS))
- return -EBUSY;
-
/* Trim the upper limit to the max. */
if (max < mas->last)
mas->last = max;
--
2.20.1
next prev parent reply other threads:[~2023-04-25 11:05 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-25 11:05 [PATCH 0/9] fix, rework and clean up for maple tree Peng Zhang
2023-04-25 11:05 ` [PATCH 1/9] maple_tree: Fix allocation when min is equal to max in mas_empty_area/_area_rev() Peng Zhang
2023-04-25 11:05 ` [PATCH 2/9] maple_tree: Make maple state reusable after mas_empty_area() Peng Zhang
2023-04-25 16:00 ` Liam R. Howlett
2023-04-25 11:05 ` [PATCH 3/9] maple_tree: Modify the allocation method of mtree_alloc_range/rrange() Peng Zhang
2023-04-25 16:08 ` Liam R. Howlett
2023-04-26 12:34 ` Peng Zhang
2023-04-27 1:10 ` Liam R. Howlett
2023-04-25 11:05 ` [PATCH 4/9] maple_tree: Update mtree_alloc_rrange() and mtree_alloc_range() testing Peng Zhang
2023-04-25 16:09 ` Liam R. Howlett
2023-04-25 11:05 ` [PATCH 5/9] maple_tree: Remove an if statement that cannot be true Peng Zhang
2023-04-25 16:16 ` Liam R. Howlett
2023-04-25 11:05 ` [PATCH 6/9] maple_tree: Remove a confusing check Peng Zhang
2023-04-25 16:23 ` Liam R. Howlett
2023-04-25 11:05 ` [PATCH 7/9] maple_tree: Delete redundant code in mas_next_node() Peng Zhang
2023-04-25 16:45 ` Liam R. Howlett
2023-04-26 11:43 ` Peng Zhang
2023-04-25 11:05 ` Peng Zhang [this message]
2023-04-25 17:00 ` [PATCH 8/9] maple_tree: Remove the redundant check of mas->offset in mas_empty_area/area_rev() Liam R. Howlett
2023-04-25 11:05 ` [PATCH 9/9] maple_tree: Move declaration of mas_empty_area_rev() to a better place Peng Zhang
2023-04-25 17:04 ` Liam R. Howlett
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230425110511.11680-9-zhangpeng.00@bytedance.com \
--to=zhangpeng.00@bytedance.com \
--cc=Liam.Howlett@oracle.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=maple-tree@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox