Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 42983
b: refs/heads/master
c: c56d256
h: refs/heads/master
i:
  42981: a98d0b9
  42979: de2f1b9
  42975: 291a219
v: v3
  • Loading branch information
Hugh Dickins authored and Linus Torvalds committed Dec 7, 2006
1 parent 38bca5c commit 41c5e62
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ff50dc562bf6de00fec264b11531e2745209ba12
refs/heads/master: c56d2561f7189762c4fce854630d4f7f6d64ccee
6 changes: 3 additions & 3 deletions trunk/fs/ext3/balloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 41c5e62

Please sign in to comment.