Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

simplified getting previous and next node in red-black tree for vmalloc #302

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+34 −28
Open

simplified getting previous and next node in red-black tree for vmalloc #302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4758c1
simplified getting previous and next node in red-black tree for vmalloc
SemanShen Jul 10, 2016
598ebd1
no need to get path for a logical block
SemanShen Jul 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 17 additions & 15 deletions fs/ext4/extents.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3337,24 +3337,26 @@ static int ext4_split_extent(handle_t *handle,
map->m_lblk + map->m_len, split_flag1, flags1);
if (err)
goto out;

/*
* Update path is required because previous ext4_split_extent_at() may
* result in split of original leaf or extent zeroout.
*/
path = ext4_find_extent(inode, map->m_lblk, ppath, 0);
if (IS_ERR(path))
return PTR_ERR(path);
depth = ext_depth(inode);
ex = path[depth].p_ext;
if (!ex) {
EXT4_ERROR_INODE(inode, "unexpected hole at %lu",
(unsigned long) map->m_lblk);
return -EFSCORRUPTED;
}
unwritten = ext4_ext_is_unwritten(ex);
} else {
allocated = ee_len - (map->m_lblk - ee_block);
}
/*
* Update path is required because previous ext4_split_extent_at() may
* result in split of original leaf or extent zeroout.
*/
path = ext4_find_extent(inode, map->m_lblk, ppath, 0);
if (IS_ERR(path))
return PTR_ERR(path);
depth = ext_depth(inode);
ex = path[depth].p_ext;
if (!ex) {
EXT4_ERROR_INODE(inode, "unexpected hole at %lu",
(unsigned long) map->m_lblk);
return -EFSCORRUPTED;
}
unwritten = ext4_ext_is_unwritten(ex);

split_flag1 = 0;

if (map->m_lblk >= ee_block) {
Expand Down
30 changes: 17 additions & 13 deletions mm/vmalloc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ static void __insert_vmap_area(struct vmap_area *va)
{
struct rb_node **p = &vmap_area_root.rb_node;
struct rb_node *parent = NULL;
struct rb_node *tmp;
struct rb_node *prev = NULL;

while (*p) {
struct vmap_area *tmp_va;
Expand All @@ -323,21 +323,21 @@ static void __insert_vmap_area(struct vmap_area *va)
tmp_va = rb_entry(parent, struct vmap_area, rb_node);
if (va->va_start < tmp_va->va_end)
p = &(*p)->rb_left;
else if (va->va_end > tmp_va->va_start)
else if (va->va_end > tmp_va->va_start){
prev = *p;
p = &(*p)->rb_right;
else
}else
BUG();
}

rb_link_node(&va->rb_node, parent, p);
rb_insert_color(&va->rb_node, &vmap_area_root);

/* address-sort this list */
tmp = rb_prev(&va->rb_node);
if (tmp) {
struct vmap_area *prev;
prev = rb_entry(tmp, struct vmap_area, rb_node);
list_add_rcu(&va->list, &prev->list);
if (prev) {
struct vmap_area *prev_area;
prev_area = rb_entry(prev, struct vmap_area, rb_node);
list_add_rcu(&va->list, &prev_area->list);
} else
list_add_rcu(&va->list, &vmap_area_list);
}
Expand Down Expand Up @@ -2316,15 +2316,19 @@ static bool pvm_find_next_prev(unsigned long end,
struct vmap_area **pprev)
{
struct rb_node *n = vmap_area_root.rb_node;
struct rb_node *prev = NULL;
struct rb_node *next = NULL;
struct vmap_area *va = NULL;

while (n) {
va = rb_entry(n, struct vmap_area, rb_node);
if (end < va->va_end)
if (end < va->va_end){
next = n;
n = n->rb_left;
else if (end > va->va_end)
}else if (end > va->va_end){
prev = n;
n = n->rb_right;
else
}else
break;
}

Expand All @@ -2333,10 +2337,10 @@ static bool pvm_find_next_prev(unsigned long end,

if (va->va_end > end) {
*pnext = va;
*pprev = node_to_va(rb_prev(&(*pnext)->rb_node));
*pprev = node_to_va(prev));
} else {
*pprev = va;
*pnext = node_to_va(rb_next(&(*pprev)->rb_node));
*pnext = node_to_va(next);
}
return true;
}
Expand Down