summaryrefslogtreecommitdiff
path: root/util-linux/mkfs_ext2.c
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2009-10-20 16:21:29 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2009-10-20 16:21:29 +0200
commitcbeb4528247cca8eb1aa6c5d7e43778ea6de1762 (patch)
treed24754751af23bf00c864c668cfe481cc1217c42 /util-linux/mkfs_ext2.c
parent95484c870645ebda34c9202799f3b31111b90e4f (diff)
downloadbusybox-cbeb4528247cca8eb1aa6c5d7e43778ea6de1762.tar.gz
mkfs_ext2: fix 60k image creation
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'util-linux/mkfs_ext2.c')
-rw-r--r--util-linux/mkfs_ext2.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/util-linux/mkfs_ext2.c b/util-linux/mkfs_ext2.c
index da27dc77d..5d5429f07 100644
--- a/util-linux/mkfs_ext2.c
+++ b/util-linux/mkfs_ext2.c
@@ -88,13 +88,14 @@ static uint32_t div_roundup(uint64_t size, uint32_t n)
static void allocate(uint8_t *bitmap, uint32_t blocksize, uint32_t start, uint32_t end)
{
uint32_t i;
+
+//bb_info_msg("ALLOC: [%u][%u][%u]: [%u-%u]:=[%x],[%x]", blocksize, start, end, start/8, blocksize - end/8 - 1, (1 << (start & 7)) - 1, (uint8_t)(0xFF00 >> (end & 7)));
memset(bitmap, 0, blocksize);
i = start / 8;
memset(bitmap, 0xFF, i);
- bitmap[i] = 0xFF >> (8 - (start & 7));
-//bb_info_msg("ALLOC: [%u][%u][%u]: [%u-%u]:=[%x],[%x]", blocksize, start, end, start/8, blocksize - end/8 - 1, 0xFF >> (8 - (start & 7)), (uint8_t)(0xFF << (8-(end&7))));
+ bitmap[i] = (1 << (start & 7)) - 1; //0..7 => 00000000..01111111
i = end / 8;
- bitmap[blocksize - i - 1] = 0xFF << (8 - (end & 7));
+ bitmap[blocksize - i - 1] |= 0x7F00 >> (end & 7); //0..7 => 00000000..11111110
memset(bitmap + blocksize - i, 0xFF, i); // N.B. no overflow here!
}