From 0594bf0169bd0b3c6fed8e77b67c26d37561bf58 Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Sun, 16 Apr 1995 20:33:47 +0000 Subject: Formerly balloc.c.~9~ --- ext2fs/balloc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ext2fs/balloc.c b/ext2fs/balloc.c index 4ccfc5af..28b374b6 100644 --- a/ext2fs/balloc.c +++ b/ext2fs/balloc.c @@ -77,7 +77,7 @@ ext2_free_blocks (unsigned long block, unsigned long count) "Block = %lu, count = %lu", block, count); gdp = group_desc (block_group); - bh = bptr (gdp->bg_block_bitmap); + bh = block_image (gdp->bg_block_bitmap); if (check_strict && (in_range (gdp->bg_block_bitmap, block, count) || @@ -161,7 +161,7 @@ repeat: if (j) goal_attempts++; #endif - bh = bptr (gdp->bg_block_bitmap); + bh = block_image (gdp->bg_block_bitmap); ext2_debug ("goal is at %d:%d.\n", i, j); @@ -246,7 +246,7 @@ repeat: spin_unlock (&sblock_lock); return 0; } - bh = bptr (gdp->bg_block_bitmap); + bh = block_image (gdp->bg_block_bitmap); r = memscan (bh, 0, sblock->s_blocks_per_group >> 3); j = (r - bh) << 3; if (j < sblock->s_blocks_per_group) @@ -326,7 +326,7 @@ got_block: goto sync_out; } - bh = bptr (j); + bh = block_image (j); memset (bh, 0, block_size); pokel_add (&sblock_pokel, bh, block_size); @@ -363,7 +363,7 @@ ext2_count_free_blocks () { gdp = group_desc (i); desc_count += gdp->bg_free_blocks_count; - x = count_free (bptr (gdb->bg_block_bitmap), block_size); + x = count_free (block_image (gdb->bg_block_bitmap), block_size); printk ("group %d: stored = %d, counted = %lu\n", i, gdp->bg_free_blocks_count, x); bitmap_count += x; @@ -405,7 +405,7 @@ ext2_check_blocks_bitmap () { gdp = group_desc (i); desc_count += gdp->bg_free_blocks_count; - bh = bptr (gdp->bg_block_bitmap); + bh = block_image (gdp->bg_block_bitmap); if (!test_bit (0, bh)) ext2_error ("ext2_check_blocks_bitmap", -- cgit v1.2.3