[PATCH] ext4 balloc: say rb_entry not list_entry
The reservations tree is an rb_tree not a list, so it's less confusing to use rb_entry() than list_entry() - though they're both just container_of(). Signed-off-by: Mingming Cao <cmm@us.ibm.com> Signed-off-by: Hugh Dickins <hugh@veritas.com> Cc: <linux-ext4@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
b2f2c76d17
commit
b78a657f0a
@ -165,7 +165,7 @@ static void __rsv_window_dump(struct rb_root *root, int verbose,
|
|||||||
|
|
||||||
printk("Block Allocation Reservation Windows Map (%s):\n", fn);
|
printk("Block Allocation Reservation Windows Map (%s):\n", fn);
|
||||||
while (n) {
|
while (n) {
|
||||||
rsv = list_entry(n, struct ext4_reserve_window_node, rsv_node);
|
rsv = rb_entry(n, struct ext4_reserve_window_node, rsv_node);
|
||||||
if (verbose)
|
if (verbose)
|
||||||
printk("reservation window 0x%p "
|
printk("reservation window 0x%p "
|
||||||
"start: %llu, end: %llu\n",
|
"start: %llu, end: %llu\n",
|
||||||
@ -966,7 +966,7 @@ static int find_next_reservable_window(
|
|||||||
|
|
||||||
prev = rsv;
|
prev = rsv;
|
||||||
next = rb_next(&rsv->rsv_node);
|
next = rb_next(&rsv->rsv_node);
|
||||||
rsv = list_entry(next,struct ext4_reserve_window_node,rsv_node);
|
rsv = rb_entry(next,struct ext4_reserve_window_node,rsv_node);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Reached the last reservation, we can just append to the
|
* Reached the last reservation, we can just append to the
|
||||||
@ -1210,7 +1210,7 @@ static void try_to_extend_reservation(struct ext4_reserve_window_node *my_rsv,
|
|||||||
if (!next)
|
if (!next)
|
||||||
my_rsv->rsv_end += size;
|
my_rsv->rsv_end += size;
|
||||||
else {
|
else {
|
||||||
next_rsv = list_entry(next, struct ext4_reserve_window_node, rsv_node);
|
next_rsv = rb_entry(next, struct ext4_reserve_window_node, rsv_node);
|
||||||
|
|
||||||
if ((next_rsv->rsv_start - my_rsv->rsv_end - 1) >= size)
|
if ((next_rsv->rsv_start - my_rsv->rsv_end - 1) >= size)
|
||||||
my_rsv->rsv_end += size;
|
my_rsv->rsv_end += size;
|
||||||
|
Loading…
Reference in New Issue
Block a user