2021-06-11 06:44:27

by Baokun Li

Subject: [PATCH -next v2] btrfs: send: use list_move_tail instead of list_del/list_add_tail in send.c

Using list_move_tail() instead of list_del() + list_add_tail() in send.c.
And open-code name_cache_used() as there is only one user.

Reported-by: Hulk Robot <[email protected]>
Signed-off-by: Baokun Li <[email protected]>
---
V1->V2:
open-code name_cache_used()

fs/btrfs/send.c | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index bd69db72acc5..418ada6139fd 100644
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -2077,16 +2077,6 @@ static struct name_cache_entry *name_cache_search(struct send_ctx *sctx,
return NULL;
}

-/*
- * Removes the entry from the list and adds it back to the end. This marks the
- * entry as recently used so that name_cache_clean_unused does not remove it.
- */
-static void name_cache_used(struct send_ctx *sctx, struct name_cache_entry *nce)
-{
- list_del(&nce->list);
- list_add_tail(&nce->list, &sctx->name_cache_list);
-}
-
/*
* Remove some entries from the beginning of name_cache_list.
*/
@@ -2147,7 +2137,14 @@ static int __get_cur_name_and_parent(struct send_ctx *sctx,
kfree(nce);
nce = NULL;
} else {
- name_cache_used(sctx, nce);
+
+ /*
+ * Removes the entry from the list and adds it back to the end.
+ * This marks the entry as recently used so that
+ * name_cache_clean_unused does not remove it.
+ */
+ list_move_tail(&nce->list, &sctx->name_cache_list);
+
*parent_ino = nce->parent_ino;
*parent_gen = nce->parent_gen;
ret = fs_path_add(dest, nce->name, nce->name_len);
--
2.31.1

2021-06-11 12:43:00

by David Sterba

Subject: Re: [PATCH -next v2] btrfs: send: use list_move_tail instead of list_del/list_add_tail in send.c

On Fri, Jun 11, 2021 at 02:51:15PM +0800, Baokun Li wrote:
> Using list_move_tail() instead of list_del() + list_add_tail() in send.c.
> And open-code name_cache_used() as there is only one user.
>
> Reported-by: Hulk Robot <[email protected]>
> Signed-off-by: Baokun Li <[email protected]>
> ---
> V1->V2:
> open-code name_cache_used()

Added to misc-next, thanks.