| Message ID | 20230522050656.96215-4-zhangpeng.00@bytedance.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Clean ups for maple tree | expand |
* Peng Zhang <zhangpeng.00@bytedance.com> [230522 01:07]: > Fix the arguments to __must_hold() to make sparse work. > > Signed-off-by: Peng Zhang <zhangpeng.00@bytedance.com> Reviewed-by: Liam R. Howlett <Liam.Howlett@oracle.com> > --- > lib/maple_tree.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/lib/maple_tree.c b/lib/maple_tree.c > index 263bd0ccc31b..3fe6a6685384 100644 > --- a/lib/maple_tree.c > +++ b/lib/maple_tree.c > @@ -1752,7 +1752,7 @@ static inline void mas_adopt_children(struct ma_state *mas, > * leave the node (true) and handle the adoption and free elsewhere. > */ > static inline void mas_replace(struct ma_state *mas, bool advanced) > - __must_hold(mas->tree->lock) > + __must_hold(mas->tree->ma_lock) > { > struct maple_node *mn = mas_mn(mas); > struct maple_enode *old_enode; > @@ -1792,7 +1792,7 @@ static inline void mas_replace(struct ma_state *mas, bool advanced) > * @child: the maple state to store the child. > */ > static inline bool mas_new_child(struct ma_state *mas, struct ma_state *child) > - __must_hold(mas->tree->lock) > + __must_hold(mas->tree->ma_lock) > { > enum maple_type mt; > unsigned char offset; > @@ -6204,7 +6204,7 @@ EXPORT_SYMBOL_GPL(mas_erase); > * Return: true on allocation, false otherwise. > */ > bool mas_nomem(struct ma_state *mas, gfp_t gfp) > - __must_hold(mas->tree->lock) > + __must_hold(mas->tree->ma_lock) > { > if (likely(mas->node != MA_ERROR(-ENOMEM))) { > mas_destroy(mas); > -- > 2.20.1 >
diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 263bd0ccc31b..3fe6a6685384 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -1752,7 +1752,7 @@ static inline void mas_adopt_children(struct ma_state *mas, * leave the node (true) and handle the adoption and free elsewhere. */ static inline void mas_replace(struct ma_state *mas, bool advanced) - __must_hold(mas->tree->lock) + __must_hold(mas->tree->ma_lock) { struct maple_node *mn = mas_mn(mas); struct maple_enode *old_enode; @@ -1792,7 +1792,7 @@ static inline void mas_replace(struct ma_state *mas, bool advanced) * @child: the maple state to store the child. */ static inline bool mas_new_child(struct ma_state *mas, struct ma_state *child) - __must_hold(mas->tree->lock) + __must_hold(mas->tree->ma_lock) { enum maple_type mt; unsigned char offset; @@ -6204,7 +6204,7 @@ EXPORT_SYMBOL_GPL(mas_erase); * Return: true on allocation, false otherwise. */ bool mas_nomem(struct ma_state *mas, gfp_t gfp) - __must_hold(mas->tree->lock) + __must_hold(mas->tree->ma_lock) { if (likely(mas->node != MA_ERROR(-ENOMEM))) { mas_destroy(mas);
Fix the arguments to __must_hold() to make sparse work. Signed-off-by: Peng Zhang <zhangpeng.00@bytedance.com> --- lib/maple_tree.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)