Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 42912
b: refs/heads/master
c: b78a657
h: refs/heads/master
v: v3
  • Loading branch information
Hugh Dickins authored and Linus Torvalds committed Dec 7, 2006
1 parent 04ce238 commit e746d27
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: b2f2c76d17b68869914a1ec3ab04c7674668f60d
refs/heads/master: b78a657f0a64134b3813bbdf4e1853d1420eb8d4
6 changes: 3 additions & 3 deletions trunk/fs/ext4/balloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit e746d27

Please sign in to comment.