Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935968AbWK1RnU (ORCPT ); Tue, 28 Nov 2006 12:43:20 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S935976AbWK1RnU (ORCPT ); Tue, 28 Nov 2006 12:43:20 -0500 Received: from excu-mxob-2.symantec.com ([198.6.49.23]:56485 "EHLO excu-mxob-2.symantec.com") by vger.kernel.org with ESMTP id S935968AbWK1RnS (ORCPT ); Tue, 28 Nov 2006 12:43:18 -0500 X-AuditID: c6063117-a05b8bb000005266-2c-456c752fabee Date: Tue, 28 Nov 2006 17:43:32 +0000 (GMT) From: Hugh Dickins X-X-Sender: hugh@blonde.wat.veritas.com To: Mingming Cao cc: Andrew Morton , Mel Gorman , "Martin J. Bligh" , linux-kernel@vger.kernel.org, "linux-ext4@vger.kernel.org" Subject: [PATCH 5/6] ext2 balloc: say rb_entry not list_entry In-Reply-To: Message-ID: References: <20061114014125.dd315fff.akpm@osdl.org> <20061114184919.GA16020@skynet.ie> <20061114113120.d4c22b02.akpm@osdl.org> <20061115214534.72e6f2e8.akpm@osdl.org> <455C0B6F.7000201@us.ibm.com> <20061115232228.afaf42f2.akpm@osdl.org> <1163666960.4310.40.camel@localhost.localdomain> <20061116011351.1401a00f.akpm@osdl.org> <1163708116.3737.12.camel@dyn9047017103.beaverton.ibm.com> <20061116132724.1882b122.akpm@osdl.org> <1164073652.20900.34.camel@dyn9047017103.beaverton.ibm.com> <1164156193.3804.48.camel@dyn9047017103.beaverton.ibm.com> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-OriginalArrivalTime: 28 Nov 2006 17:43:11.0779 (UTC) FILETIME=[AC817F30:01C71314] X-Brightmail-Tracker: AAAAAA== Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1658 Lines: 43 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: Hugh Dickins --- fs/ext2/balloc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- 2.6.19-rc6-mm2/fs/ext2/balloc.c 2006-11-24 08:18:02.000000000 +0000 +++ linux/fs/ext2/balloc.c 2006-11-27 19:28:41.000000000 +0000 @@ -156,7 +156,7 @@ restart: printk("Block Allocation Reservation Windows Map (%s):\n", fn); while (n) { - rsv = list_entry(n, struct ext2_reserve_window_node, rsv_node); + rsv = rb_entry(n, struct ext2_reserve_window_node, rsv_node); if (verbose) printk("reservation window 0x%p " "start: %lu, end: %lu\n", @@ -753,7 +753,7 @@ static int find_next_reservable_window( prev = rsv; next = rb_next(&rsv->rsv_node); - rsv = list_entry(next,struct ext2_reserve_window_node,rsv_node); + rsv = rb_entry(next,struct ext2_reserve_window_node,rsv_node); /* * Reached the last reservation, we can just append to the @@ -995,7 +995,7 @@ static void try_to_extend_reservation(st if (!next) my_rsv->rsv_end += size; else { - next_rsv = list_entry(next, struct ext2_reserve_window_node, rsv_node); + next_rsv = rb_entry(next, struct ext2_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 majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/