diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-06-22 23:05:57 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-06-22 23:05:57 +0000 |
| commit | 51d3b7814cdccef9188240fe0cbd8d97ff2c7470 (patch) | |
| tree | 5cbb01d0323d4f63ade66bdf48ba4a91aaa6df16 /fs/ext2/balloc.c | |
| parent | 52273a23c9a84336b93a35e4847fc88fac7eb0e4 (diff) | |
Merge with Linux 2.3.7.
WARNING: 2.3.7 is known to eat filesystems for breakfast and little
children for lunch, so if you try this on your machine make backups
first ...
Diffstat (limited to 'fs/ext2/balloc.c')
| -rw-r--r-- | fs/ext2/balloc.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c index 2c7ba02d7..053022309 100644 --- a/fs/ext2/balloc.c +++ b/fs/ext2/balloc.c @@ -358,7 +358,7 @@ error_return: * bitmap, and then for any free bit if that fails. */ int ext2_new_block (const struct inode * inode, unsigned long goal, - u32 * prealloc_count, u32 * prealloc_block, int * err) + u32 * prealloc_count, u32 * prealloc_block, int * err) { struct buffer_head * bh; struct buffer_head * bh2; @@ -594,20 +594,12 @@ got_block: if (j >= le32_to_cpu(es->s_blocks_count)) { ext2_error (sb, "ext2_new_block", - "block >= blocks count - " - "block_group = %d, block=%d", i, j); + "block(%d) >= blocks count(%d) - " + "block_group = %d, es == %p ",j, + le32_to_cpu(es->s_blocks_count), i, es); unlock_super (sb); return 0; } - if (!(bh = getblk (sb->s_dev, j, sb->s_blocksize))) { - ext2_error (sb, "ext2_new_block", "cannot get block %d", j); - unlock_super (sb); - return 0; - } - memset(bh->b_data, 0, sb->s_blocksize); - mark_buffer_uptodate(bh, 1); - mark_buffer_dirty(bh, 1); - brelse (bh); ext2_debug ("allocating block %d. " "Goal hits %d of %d.\n", j, goal_hits, goal_attempts); |