[PATCH 4/12] ext3 balloc: say rb_entry not list_entry

2006-11-28 Thread Mingming Cao

--
Subject: ext2 balloc: say rb_entry not list_entry
From: Hugh Dickins <[EMAIL PROTECTED]>

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().

--

Sync up this fix in ext3

Signed-off-by: Mingming Cao <[EMAIL PROTECTED]>
---


---

 linux-2.6.19-rc5-cmm/fs/ext3/balloc.c |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff -puN fs/ext3/balloc.c~ext3-balloc-say-rb_entry-not-list_entry 
fs/ext3/balloc.c
--- linux-2.6.19-rc5/fs/ext3/balloc.c~ext3-balloc-say-rb_entry-not-list_entry   
2006-11-28 19:36:52.0 -0800
+++ linux-2.6.19-rc5-cmm/fs/ext3/balloc.c   2006-11-28 19:36:52.0 
-0800
@@ -144,7 +144,7 @@ restart:
 
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",
@@ -949,7 +949,7 @@ static int find_next_reservable_window(
 
prev = rsv;
next = rb_next(>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
@@ -1193,7 +1193,7 @@ static void try_to_extend_reservation(st
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;

_


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[PATCH 4/12] ext3 balloc: say rb_entry not list_entry

2006-11-28 Thread Mingming Cao

--
Subject: ext2 balloc: say rb_entry not list_entry
From: Hugh Dickins [EMAIL PROTECTED]

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().

--

Sync up this fix in ext3

Signed-off-by: Mingming Cao [EMAIL PROTECTED]
---


---

 linux-2.6.19-rc5-cmm/fs/ext3/balloc.c |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff -puN fs/ext3/balloc.c~ext3-balloc-say-rb_entry-not-list_entry 
fs/ext3/balloc.c
--- linux-2.6.19-rc5/fs/ext3/balloc.c~ext3-balloc-say-rb_entry-not-list_entry   
2006-11-28 19:36:52.0 -0800
+++ linux-2.6.19-rc5-cmm/fs/ext3/balloc.c   2006-11-28 19:36:52.0 
-0800
@@ -144,7 +144,7 @@ restart:
 
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,
@@ -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
@@ -1193,7 +1193,7 @@ static void try_to_extend_reservation(st
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;

_


-
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/