Commit a7571232 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba

btrfs: use list_for_each_entry_safe in free_reloc_roots

The function always works on a local copy of the reloc root list, which
cannot be modified outside of it so using list_for_each_entry is fine.
Additionally the macro handles empty lists so drop list_empty checks of
callers. No semantic changes.
Reviewed-by: default avatarQu Wenruo <wqu@suse.com>
Signed-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 7c09c030
...@@ -1884,13 +1884,10 @@ int prepare_to_merge(struct reloc_control *rc, int err) ...@@ -1884,13 +1884,10 @@ int prepare_to_merge(struct reloc_control *rc, int err)
static noinline_for_stack static noinline_for_stack
void free_reloc_roots(struct list_head *list) void free_reloc_roots(struct list_head *list)
{ {
struct btrfs_root *reloc_root; struct btrfs_root *reloc_root, *tmp;
while (!list_empty(list)) { list_for_each_entry_safe(reloc_root, tmp, list, root_list)
reloc_root = list_entry(list->next, struct btrfs_root,
root_list);
__del_reloc_root(reloc_root); __del_reloc_root(reloc_root);
}
} }
static noinline_for_stack static noinline_for_stack
...@@ -1949,15 +1946,13 @@ void merge_reloc_roots(struct reloc_control *rc) ...@@ -1949,15 +1946,13 @@ void merge_reloc_roots(struct reloc_control *rc)
out: out:
if (ret) { if (ret) {
btrfs_handle_fs_error(fs_info, ret, NULL); btrfs_handle_fs_error(fs_info, ret, NULL);
if (!list_empty(&reloc_roots)) free_reloc_roots(&reloc_roots);
free_reloc_roots(&reloc_roots);
/* new reloc root may be added */ /* new reloc root may be added */
mutex_lock(&fs_info->reloc_mutex); mutex_lock(&fs_info->reloc_mutex);
list_splice_init(&rc->reloc_roots, &reloc_roots); list_splice_init(&rc->reloc_roots, &reloc_roots);
mutex_unlock(&fs_info->reloc_mutex); mutex_unlock(&fs_info->reloc_mutex);
if (!list_empty(&reloc_roots)) free_reloc_roots(&reloc_roots);
free_reloc_roots(&reloc_roots);
} }
/* /*
...@@ -3869,8 +3864,7 @@ int btrfs_recover_relocation(struct btrfs_root *root) ...@@ -3869,8 +3864,7 @@ int btrfs_recover_relocation(struct btrfs_root *root)
unset_reloc_control(rc); unset_reloc_control(rc);
free_reloc_control(rc); free_reloc_control(rc);
out: out:
if (!list_empty(&reloc_roots)) free_reloc_roots(&reloc_roots);
free_reloc_roots(&reloc_roots);
btrfs_free_path(path); btrfs_free_path(path);
......
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