Commit 14c4b5ab authored by Peng Zhang's avatar Peng Zhang Committed by Andrew Morton

maple_tree: fix the arguments to __must_hold()

Fix the arguments to __must_hold() to make sparse work.

Link: https://lkml.kernel.org/r/20230524031247.65949-4-zhangpeng.00@bytedance.comSigned-off-by: default avatarPeng Zhang <zhangpeng.00@bytedance.com>
Reviewed-by: default avatarLiam R. Howlett <Liam.Howlett@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent c2aa6f53
...@@ -1752,7 +1752,7 @@ static inline void mas_adopt_children(struct ma_state *mas, ...@@ -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. * leave the node (true) and handle the adoption and free elsewhere.
*/ */
static inline void mas_replace(struct ma_state *mas, bool advanced) 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_node *mn = mas_mn(mas);
struct maple_enode *old_enode; struct maple_enode *old_enode;
...@@ -1792,7 +1792,7 @@ static inline void mas_replace(struct ma_state *mas, bool advanced) ...@@ -1792,7 +1792,7 @@ static inline void mas_replace(struct ma_state *mas, bool advanced)
* @child: the maple state to store the child. * @child: the maple state to store the child.
*/ */
static inline bool mas_new_child(struct ma_state *mas, struct ma_state *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; enum maple_type mt;
unsigned char offset; unsigned char offset;
...@@ -6204,7 +6204,7 @@ EXPORT_SYMBOL_GPL(mas_erase); ...@@ -6204,7 +6204,7 @@ EXPORT_SYMBOL_GPL(mas_erase);
* Return: true on allocation, false otherwise. * Return: true on allocation, false otherwise.
*/ */
bool mas_nomem(struct ma_state *mas, gfp_t gfp) 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))) { if (likely(mas->node != MA_ERROR(-ENOMEM))) {
mas_destroy(mas); mas_destroy(mas);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment