mm/mmap.c: refine find_vma_prev with rb_last
Subsystems (2)
PATCH v2 1/1 mm/mmap.c: refine find_vma_prev with rb_last
When addr is out of the range of the whole rb_tree, pprev will points to the right-most node. rb_tree facility already provides a helper function, rb_last, to do this task. We can leverage this instead of re-implement it.
This patch refines find_vma_prev with rb_last to make it a little nicer to read.
---
v2: leverage rb_last
--- mm/mmap.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
mm/mmap.c +3 -6
@@ -2270,12 +2270,9 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr,if (vma) { *pprev = vma->vm_prev; }else { -struct rb_node *rb_node = mm->mm_rb.rb_node; - *pprev =NULL ; -while (rb_node) { - *pprev = rb_entry(rb_node, struct vm_area_struct, vm_rb); - rb_node = rb_node->rb_right; - } +struct rb_node *rb_node =rb_last (&mm->mm_rb); + *pprev = !rb_node ?NULL : + rb_entry(rb_node, struct vm_area_struct, vm_rb); }return vma; }
Signature · 1 line
2.17.1
Quoted 9 lines · Wei Yang
When addr is out of the range of the whole
rb_tree, pprev will points to the right-most node.rb_treefacility already provides a helper function,rb_last, to do this task. We can leverage this instead of re-implement it.This patch refines
find_vma_prevwithrb_lastto make it a little nicer to read.Signed-off-by Wei Yang <[email protected]>
Nit below:
Quoted 13 lines
---
v2: leveragerb_last--- mm/mmap.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)mm/mmap.c +0
-0@@ -2270,12 +2270,9 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr,if (vma) { *pprev = vma->vm_prev;
mm/mmap.c find_vma_prev(struct mm_struct *mm, unsigned long addr, · line 2275
Quoted 10 lines
mm/mmap.c +3
-6}else { -struct rb_node *rb_node = mm->mm_rb.rb_node; - *pprev =NULL ; -while (rb_node) { - *pprev = rb_entry(rb_node, struct vm_area_struct, vm_rb); - rb_node = rb_node->rb_right; - } +struct rb_node *rb_node =rb_last (&mm->mm_rb); + *pprev = !rb_node ?NULL : + rb_entry(rb_node, struct vm_area_struct, vm_rb);
It's perhaps more common to write it like:
*pprev = rb_node ? rb_entry(rb_node, struct vm_area_struct, vm_rb) : NULL;
Quoted 4 lines
mm/mmap.c +0
-0}return vma; }
Quoted 33 lines · Vlastimil Babka
Quoted 9 lines · Wei Yang
When addr is out of the range of the whole
rb_tree, pprev will points to the right-most node.rb_treefacility already provides a helper function,rb_last, to do this task. We can leverage this instead of re-implement it.This patch refines
find_vma_prevwithrb_lastto make it a little nicer to read.Signed-off-by Wei Yang <[email protected]>Acked-by Vlastimil Babka <[email protected]>Nit below:
Quoted 18 lines
---
v2: leveragerb_last--- mm/mmap.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)mm/mmap.c +0
-4@@ -2270,12 +2270,9 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr,if (vma) { *pprev = vma->vm_prev; }else { -struct rb_node *rb_node = mm->mm_rb.rb_node; - *pprev =NULL ; -while (rb_node) { - *pprev = rb_entry(rb_node, struct vm_area_struct, vm_rb);
Quoted 9 lines
mm/mmap.c find_vma_prev(struct mm_struct *mm, unsigned long addr, · line 2275
Quoted 5 lines
mm/mmap.c +3
-2- rb_node = rb_node->rb_right; - } +struct rb_node *rb_node =rb_last (&mm->mm_rb); + *pprev = !rb_node ?NULL : + rb_entry(rb_node, struct vm_area_struct, vm_rb);It's perhaps more common to write it like:
*pprev =rb_node?rb_entry(rb_node, struct vm_area_struct, vm_rb): NULL;
Do you prefer me to send v3 with this updated?
Quoted 4 lines
Quoted 4 lines
mm/mmap.c +0
-0}return vma; }
Signature · 2 lines
Wei Yang Help you, Help me