Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c56d2561 authored by Hugh Dickins's avatar Hugh Dickins Committed by Linus Torvalds
Browse files

[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: default avatarMingming Cao <cmm@us.ibm.com>
Signed-off-by: default avatarHugh Dickins <hugh@veritas.com>
Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ff50dc56

fs/ext3/balloc.c

+3 −3
Original line number Diff line number Diff line
@@ -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",
@@ -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(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;