Skip to content

Commit

Permalink
[PATCH] ext3 balloc: say rb_entry not list_entry
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Hugh Dickins authored and Linus Torvalds committed Dec 7, 2006
1 parent ff50dc5 commit c56d256
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions fs/ext3/balloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ static void __rsv_window_dump(struct rb_root *root, int verbose,

printk("Block Allocation Reservation Windows Map (%s):\n", fn);
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)
printk("reservation window 0x%p "
"start: %lu, end: %lu\n",
Expand Down Expand Up @@ -949,7 +949,7 @@ static int find_next_reservable_window(

prev = rsv;
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
Expand Down Expand Up @@ -1193,7 +1193,7 @@ static void try_to_extend_reservation(struct ext3_reserve_window_node *my_rsv,
if (!next)
my_rsv->rsv_end += size;
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)
my_rsv->rsv_end += size;
Expand Down

0 comments on commit c56d256

Please sign in to comment.