btrfs: Use list_last_entry in add_falloc_range
PATCH 1/1 btrfs: Use list_last_entry in add_falloc_range
Instead of calling list_entry with head->prev simply call list_last_entry which makes it obvious which member of the list is being referred. This allows to remove the extra 'prev' pointer.
Signed-off-by Nikolay Borisov <[email protected]>
--- fs/btrfs/file.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
fs/btrfs/file.c +3 -4
@@ -3034,7 +3034,6 @@ struct falloc_range {*/ static int add_falloc_range (struct list_head *head,u64 start,u64 len) { -struct falloc_range *prev =NULL ;struct falloc_range *range =NULL ;if (list_empty (head))
@@ -3044,9 +3043,9 @@ static int add_falloc_range(struct list_head *head, u64 start, u64 len)* As fallocate iterate by bytenr order, we only need to check * the last range. */ - prev = list_entry(head->prev, struct falloc_range, list); -if (prev->start + prev->len == start) { - prev->len += len; + range = list_last_entry(head, struct falloc_range, list); +if (range->start + range->len == start) { + range->len += len;return 0 ; } insert:
Signature · 1 line
2.25.1
Quoted 5 lines · Nikolay Borisov
Instead of calling
list_entrywithhead->prevsimply calllist_last_entrywhich makes it obvious which member of the list is being referred. This allows to remove the extra 'prev' pointer.Signed-off-by Nikolay Borisov <[email protected]>
Added to misc-next, thanks.
Quoted 19 lines
--- fs/btrfs/file.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)fs/btrfs/file.c +0
-1@@ -3034,7 +3034,6 @@ struct falloc_range {*/ static int add_falloc_range (struct list_head *head,u64 start,u64 len) { -struct falloc_range *prev =NULL ;struct falloc_range *range =NULL ;if (list_empty (head))@@ -3044,9 +3043,9 @@ static int add_falloc_range(struct list_head *head, u64 start, u64 len)* As fallocate iterate by bytenr order, we only need to check * the last range.
fs/btrfs/file.c static int add_falloc_range(struct list_head *head, u64 start, u64 len) · line 3051
Quoted 10 lines
fs/btrfs/file.c +3
-3*/ - prev = list_entry(head->prev, struct falloc_range, list); -if (prev->start + prev->len == start) { - prev->len += len; + range = list_last_entry(head, struct falloc_range, list); +if (range->start + range->len == start) { + range->len += len;return 0 ; } insert:
The function could be restructured a bit to get rid of the insert:
label, like:
if (!list_empty(head)) {
range = list_last(...)
if (range->start ...) {
return;
}
}
range = kmalloc(...)
<the rest>