maple_tree-modified-return-type-of-mas_wr_store_entry.patch removed from -mm tree
The quilt patch titled
Subject: maple_tree: modified return type of mas_wr_store_entry()
has been removed from the -mm tree. Its filename was
maple_tree-modified-return-type-of-mas_wr_store_entry.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: JaeJoon Jung <[email protected]>
Subject: maple_tree: modified return type of mas_wr_store_entry()
Date: Fri, 14 Jun 2024 18:24:28 +0900
Since the return value of mas_wr_store_entry() is not used, the return type can be changed to void.
Signed-off-by JaeJoon Jung <[email protected]>
Reviewed-by Liam R. Howlett <[email protected]>
Cc Sidhartha Kumar <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
lib/maple_tree.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
lib/maple_tree.c renamed from lib/maple_tree.c~maple_tree-modified-return-type-of-mas_wr_store_entry +6 -9
@@ -4203,31 +4203,28 @@ slow_path:* * Return: The contents that was stored at the index. */ -static inline void *mas_wr_store_entry (struct ma_wr_state *wr_mas) +static inline void mas_wr_store_entry (struct ma_wr_state *wr_mas) {struct ma_state *mas = wr_mas->mas; wr_mas->content =mas_start (mas);if (mas_is_none (mas) ||mas_is_ptr (mas)) {mas_store_root (mas, wr_mas->entry); -return wr_mas->content; +return ; }if (unlikely (!mas_wr_walk (wr_mas))) {mas_wr_spanning_store (wr_mas); -return wr_mas->content; +return ; }/* At this point, we are at the leaf node that needs to be altered. */ mas_wr_end_piv (wr_mas);/* New root for a single pointer */ -if (unlikely (!mas->index && mas->last ==ULONG_MAX )) { +if (unlikely (!mas->index && mas->last ==ULONG_MAX ))mas_new_root (mas, wr_mas->entry); -return wr_mas->content; - } - -mas_wr_modify (wr_mas); -return wr_mas->content; +else +mas_wr_modify (wr_mas); }/**
_
Patches currently in -mm which might be from [email protected] are