提交 c56d2561 编写于 作者: H Hugh Dickins 提交者: Linus Torvalds

[PATCH] ext3 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: NMingming Cao <cmm@us.ibm.com>
Signed-off-by: NHugh Dickins <hugh@veritas.com>
Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
上级 ff50dc56
...@@ -144,7 +144,7 @@ static void __rsv_window_dump(struct rb_root *root, int verbose, ...@@ -144,7 +144,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 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( ...@@ -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, ...@@ -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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册