| Message ID | 20230515131757.60035-6-zhangpeng.00@bytedance.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Clean ups for maple tree | expand |
* Peng Zhang <zhangpeng.00@bytedance.com> [230515 09:18]: > Just make the code symmetrical to improve readability. > > Signed-off-by: Peng Zhang <zhangpeng.00@bytedance.com> Reviewed-by: Liam R. Howlett <Liam.Howlett@oracle.com> > --- > lib/maple_tree.c | 26 ++++++++++++++------------ > 1 file changed, 14 insertions(+), 12 deletions(-) > > diff --git a/lib/maple_tree.c b/lib/maple_tree.c > index fbb6efc40e576..4c649d75a4923 100644 > --- a/lib/maple_tree.c > +++ b/lib/maple_tree.c > @@ -4256,19 +4256,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) { > -- > 2.20.1 >
diff --git a/lib/maple_tree.c b/lib/maple_tree.c index fbb6efc40e576..4c649d75a4923 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -4256,19 +4256,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) {
Just make the code symmetrical to improve readability. Signed-off-by: Peng Zhang <zhangpeng.00@bytedance.com> --- lib/maple_tree.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-)