From e746d279579cc1cbc7aea5c5e8da5006600cf8c5 Mon Sep 17 00:00:00 2001 From: Hugh Dickins Date: Wed, 6 Dec 2006 20:39:21 -0800 Subject: [PATCH] --- yaml --- r: 42912 b: refs/heads/master c: b78a657f0a64134b3813bbdf4e1853d1420eb8d4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ext4/balloc.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f35d79985d4e..d4baed5d19a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b2f2c76d17b68869914a1ec3ab04c7674668f60d +refs/heads/master: b78a657f0a64134b3813bbdf4e1853d1420eb8d4 diff --git a/trunk/fs/ext4/balloc.c b/trunk/fs/ext4/balloc.c index c5589b3f58e8..8e7249e3e39d 100644 --- a/trunk/fs/ext4/balloc.c +++ b/trunk/fs/ext4/balloc.c @@ -165,7 +165,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 ext4_reserve_window_node, rsv_node); + rsv = rb_entry(n, struct ext4_reserve_window_node, rsv_node); if (verbose) printk("reservation window 0x%p " "start: %llu, end: %llu\n", @@ -966,7 +966,7 @@ static int find_next_reservable_window( prev = rsv; next = rb_next(&rsv->rsv_node); - rsv = list_entry(next,struct ext4_reserve_window_node,rsv_node); + rsv = rb_entry(next,struct ext4_reserve_window_node,rsv_node); /* * Reached the last reservation, we can just append to the @@ -1210,7 +1210,7 @@ static void try_to_extend_reservation(struct ext4_reserve_window_node *my_rsv, if (!next) my_rsv->rsv_end += size; else { - next_rsv = list_entry(next, struct ext4_reserve_window_node, rsv_node); + next_rsv = rb_entry(next, struct ext4_reserve_window_node, rsv_node); if ((next_rsv->rsv_start - my_rsv->rsv_end - 1) >= size) my_rsv->rsv_end += size;