f2fs: use separate list iterator variable to call list_move_tail()
PATCH 1/2 f2fs: use separate list iterator variable to call list_move_tail()
In preparation to limit the scope of a list iterator to the list traversal loop, use a dedicated pointer to point to the found element [1].
If no break is hit or the list is empty, 'next' will be NULL and list_move_tail() should be called explicitly on the head directly.
--- fs/f2fs/segment.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
fs/f2fs/segment.c +8 -4
@@ -4175,16 +4175,20 @@ static void release_sit_entry_set(struct sit_entry_set *ses)static void adjust_sit_entry_set (struct sit_entry_set *ses,struct list_head *head) { -struct sit_entry_set *next = ses; +struct sit_entry_set *next =NULL , *iter = ses;if (list_is_last (&ses->set_list, head))return ; -list_for_each_entry_continue (next, head, set_list) -if (ses->entry_cnt <= next->entry_cnt) +list_for_each_entry_continue (iter, head, set_list) +if (ses->entry_cnt <= iter->entry_cnt) { + next = iter; +list_move_tail (&ses->set_list, &iter->set_list);break ; + } -list_move_tail (&ses->set_list, &next->set_list); +if (!next) +list_move_tail (&ses->set_list, head); }static void add_sit_entry (unsigned int segno,struct list_head *head)
base-commit: d888c83fcec75194a8a48ccd283953bdba7b2550
Signature · 1 line
2.25.1
PATCH 2/2 f2fs: replace usage of found with dedicated list iterator variable
To move the list iterator variable into the list_for_each_entry_*() macro in the future it should be avoided to use the list iterator variable after the loop body.
To *never* use the list iterator variable after the loop it was concluded to use a separate iterator variable instead of a found boolean [1].
This removes the need to use a found variable and simply checking if the variable was set, can determine if the break/goto was hit.
--- fs/f2fs/segment.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-)
fs/f2fs/segment.c +13 -14
@@ -1666,33 +1666,32 @@ static unsigned int __wait_discard_cmd_range(struct f2fs_sb_info *sbi,struct discard_cmd_control *dcc =SM_I (sbi)->dcc_info;struct list_head *wait_list = (dpolicy->type ==DPOLICY_FSTRIM ) ? &(dcc->fstrim_list) : &(dcc->wait_list); -struct discard_cmd *dc, *tmp; -bool need_wait; +struct discard_cmd *dc =NULL , *iter, *tmp;unsigned int trimmed =0 ; next: - need_wait = false; + dc =NULL ;mutex_lock (&dcc->cmd_lock); -list_for_each_entry_safe (dc, tmp, wait_list, list) { -if (dc->lstart + dc->len <= start || end <= dc->lstart) +list_for_each_entry_safe (iter, tmp, wait_list, list) { +if (iter->lstart + iter->len <= start || end <= iter->lstart)continue ; -if (dc->len < dpolicy->granularity) +if (iter->len < dpolicy->granularity)continue ; -if (dc->state ==D_DONE && !dc->ref) { -wait_for_completion_io (&dc->wait); -if (!dc->error) - trimmed += dc->len; -__remove_discard_cmd (sbi, dc); +if (iter->state ==D_DONE && !iter->ref) { +wait_for_completion_io (&iter->wait); +if (!iter->error) + trimmed += iter->len; +__remove_discard_cmd (sbi, iter); }else { - dc->ref++; - need_wait = true; + iter->ref++; + dc = iter;break ; } }mutex_unlock (&dcc->cmd_lock); -if (need_wait) { +if (dc) { trimmed +=__wait_one_discard_bio (sbi, dc); goto next; }
Signature · 1 line
2.25.1
Re: [PATCH 2/2] f2fs: replace usage of found with dedicated list iterator variable
Quoted 8 lines · Jakob Koschel
To move the list iterator variable into the list_for_each_entry_*() macro in the future it should be avoided to use the list iterator variable after the loop body.
To *never* use the list iterator variable after the loop it was concluded to use a separate iterator variable instead of a found boolean [1].
Quoted 5 lines
This removes the need to use a found variable and simply checking if the variable was set, can determine if the break/goto was hit.
Thanks,
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Chao Yu
maintainerQuoted 24 lines · Jakob Koschel
In preparation to limit the scope of a list iterator to the list traversal loop, use a dedicated pointer to point to the found element [1].
If no break is hit or the list is empty, 'next' will be NULL and
list_move_tail()should be called explicitly on the head directly.Link https://lore.kernel.org/all/CAHk-=wgRr_D8CB-D9Kg-c=EHreAsk5SqXPwr9Y7k9sA6cWXJ6w@mail.gmail.com/ open hereSigned-off-by Jakob Koschel <[email protected]>--- fs/f2fs/segment.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)fs/f2fs/segment.c +1
-1@@ -4175,16 +4175,20 @@ static void release_sit_entry_set(struct sit_entry_set *ses)static void adjust_sit_entry_set (struct sit_entry_set *ses,struct list_head *head) { -struct sit_entry_set *next = ses; +struct sit_entry_set *next =NULL , *iter = ses;
fs/f2fs/segment.c static void release_sit_entry_set(struct sit_entry_set *ses) · line 4187
Quoted 10 lines
fs/f2fs/segment.c +4
-2if (list_is_last (&ses->set_list, head))return ; -list_for_each_entry_continue (next, head, set_list) -if (ses->entry_cnt <= next->entry_cnt) +list_for_each_entry_continue (iter, head, set_list) +if (ses->entry_cnt <= iter->entry_cnt) { + next = iter; +list_move_tail (&ses->set_list, &iter->set_list);break ;
return;
fs/f2fs/segment.c static void release_sit_entry_set(struct sit_entry_set *ses) · line 4191
Quoted 5 lines
fs/f2fs/segment.c +3
-1+ } -list_move_tail (&ses->set_list, &next->set_list); +if (!next) +list_move_tail (&ses->set_list, head);
list_move_tail(&ses->set_list, head);
Then we don't need @next variable, right?
Thanks,
Quoted 5 lines
fs/f2fs/segment.c +0
-0}static void add_sit_entry (unsigned int segno,struct list_head *head)base-commit:
d888c83fcec75194a8a48ccd283953bdba7b2550
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Quoted 37 lines · Chao Yu
Quoted 19 lines · Jakob Koschel
In preparation to limit the scope of a list iterator to the list traversal loop, use a dedicated pointer to point to the found element [1].
If no break is hit or the list is empty, 'next' will be NULL andlist_move_tail()should be called explicitly on the head directly.Link https://lore.kernel.org/all/CAHk-=wgRr_D8CB-D9Kg-c=EHreAsk5SqXPwr9Y7k9sA6cWXJ6w@mail.gmail.com/ open hereSigned-off-by Jakob Koschel <[email protected]>---
fs/f2fs/segment.c| 12 ++++++++----1 file changed, 8 insertions(+), 4 deletions(-)fs/f2fs/segment.c +0
-1@@ -4175,16 +4175,20 @@ static void release_sit_entry_set(struct sit_entry_set *ses)static void adjust_sit_entry_set (struct sit_entry_set *ses,struct list_head *head) { -struct sit_entry_set *next = ses;fs/f2fs/segment.c static void release_sit_entry_set(struct sit_entry_set *ses) · line 4185
Quoted 10 lines
fs/f2fs/segment.c +5
-2+struct sit_entry_set *next =NULL , *iter = ses;if (list_is_last (&ses->set_list, head))return ; -list_for_each_entry_continue (next, head, set_list) -if (ses->entry_cnt <= next->entry_cnt) +list_for_each_entry_continue (iter, head, set_list) +if (ses->entry_cnt <= iter->entry_cnt) { + next = iter; +list_move_tail (&ses->set_list, &iter->set_list);break ;return;
Quoted 8 lines
fs/f2fs/segment.c static void release_sit_entry_set(struct sit_entry_set *ses) · line 4191
Quoted 4 lines
fs/f2fs/segment.c +3
-1+ } -list_move_tail (&ses->set_list, &next->set_list); +if (!next) +list_move_tail (&ses->set_list, head);
list_move_tail(&ses->set_list, head);Then we don't need @next variable, right?
Of course yes, good spot! I'll fix and resend a v2 in the next days. Thanks for the input.
Quoted 6 lines
Thanks,
Quoted 3 lines
fs/f2fs/segment.c +0
-0}static void add_sit_entry (unsigned int segno,struct list_head *head)base-commit:
d888c83fcec75194a8a48ccd283953bdba7b2550
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel