lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] ext3 balloc: say rb_entry not list_entry

Browse Source 
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:
Hugh Dickins
2006-12-06 20:41:27 -08:00
committed by Linus Torvalds
parent ff50dc562b
commit c56d2561f7
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fs/ext3/balloc.c
View File

@@ -144,7 +144,7 @@ restart:
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 ext3_reserve_window_node, rsv_node); rsv = rb_entry(n, struct ext3_reserve_window_node, rsv_node);
if (verbose) if (verbose)
printk("reservation window 0x%p " printk("reservation window 0x%p "
"start: %lu, end: %lu\n", "start: %lu, end: %lu\n",
@@ -949,7 +949,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 ext3_reserve_window_node,rsv_node); rsv = rb_entry(next,struct ext3_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
@@ -1193,7 +1193,7 @@ static void try_to_extend_reservation(struct ext3_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 ext3_reserve_window_node, rsv_node); next_rsv = rb_entry(next, struct ext3_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;