From: akpm@osdl.org Subject: - ext3-balloc-say-rb_entry-not-list_entry.patch removed from -mm tree Date: Thu, 07 Dec 2006 15:18:05 -0800 Message-ID: <200612072318.kB7NI5Cq030994@shell0.pdx.osdl.net> Reply-To: linux-kernel@vger.kernel.org Return-path: To: hugh@veritas.com, cmm@us.ibm.com, linux-ext4@vger.kernel.org, mm-commits@vger.kernel.org Sender: mm-commits-owner@vger.kernel.org List-Id: linux-ext4.vger.kernel.org The patch titled ext3 balloc: say rb_entry not list_entry has been removed from the -mm tree. Its filename was ext3-balloc-say-rb_entry-not-list_entry.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: ext3 balloc: say rb_entry not list_entry From: Hugh Dickins 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 Signed-off-by: Hugh Dickins Cc: Signed-off-by: Andrew Morton --- 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 --- a/fs/ext3/balloc.c~ext3-balloc-say-rb_entry-not-list_entry +++ a/fs/ext3/balloc.c @@ -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; _ Patches currently in -mm which might be from hugh@veritas.com are origin.patch ext2-reservations.patch ext2-balloc-fix-_with_rsv-freeze.patch ext2-balloc-reset-windowsz-when-full.patch ext2-balloc-fix-off-by-one-against-rsv_end.patch ext2-balloc-fix-off-by-one-against-grp_goal.patch ext2-balloc-say-rb_entry-not-list_entry.patch ext2-balloc-use-io_error-label.patch generic-bug-implementation.patch generic-bug-implementation-handle-bug=n.patch generic-bug-for-i386.patch generic-bug-for-x86-64.patch bug-test-1.patch tty-switch-to-ktermios-powerpc-fix.patch