projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sysfs: Shadow directory support
[powerpc.git]
/
fs
/
ext4
/
balloc.c
diff --git
a/fs/ext4/balloc.c
b/fs/ext4/balloc.c
index
c5589b3
..
c4dd110
100644
(file)
--- a/
fs/ext4/balloc.c
+++ b/
fs/ext4/balloc.c
@@
-165,7
+165,7
@@
restart:
printk("Block Allocation Reservation Windows Map (%s):\n", fn);
while (n) {
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",
if (verbose)
printk("reservation window 0x%p "
"start: %llu, end: %llu\n",
@@
-747,7
+747,7
@@
find_next_usable_block(ext4_grpblk_t start, struct buffer_head *bh,
here = 0;
p = ((char *)bh->b_data) + (here >> 3);
here = 0;
p = ((char *)bh->b_data) + (here >> 3);
- r = memscan(p, 0, (
maxblocks - here + 7) >> 3
);
+ r = memscan(p, 0, (
(maxblocks + 7) >> 3) - (here >> 3)
);
next = (r - ((char *)bh->b_data)) << 3;
if (next < maxblocks && next >= start && ext4_test_allocatable(next, bh))
next = (r - ((char *)bh->b_data)) << 3;
if (next < maxblocks && next >= start && ext4_test_allocatable(next, bh))
@@
-966,7
+966,7
@@
static int find_next_reservable_window(
prev = rsv;
next = rb_next(&rsv->rsv_node);
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
/*
* 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 {
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;
if ((next_rsv->rsv_start - my_rsv->rsv_end - 1) >= size)
my_rsv->rsv_end += size;
@@
-1529,10
+1529,8
@@
retry_alloc:
if (group_no >= ngroups)
group_no = 0;
gdp = ext4_get_group_desc(sb, group_no, &gdp_bh);
if (group_no >= ngroups)
group_no = 0;
gdp = ext4_get_group_desc(sb, group_no, &gdp_bh);
- if (!gdp) {
- *errp = -EIO;
- goto out;
- }
+ if (!gdp)
+ goto io_error;
free_blocks = le16_to_cpu(gdp->bg_free_blocks_count);
/*
* skip this group if the number of
free_blocks = le16_to_cpu(gdp->bg_free_blocks_count);
/*
* skip this group if the number of