From 62767ae8d8e6c22651ce2ef4cd96a81df354bead Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Sun, 16 Apr 1995 20:17:58 +0000 Subject: Formerly ext2fs.c.~10~ --- ext2fs/ext2fs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ext2fs') diff --git a/ext2fs/ext2fs.c b/ext2fs/ext2fs.c index 8f47cdef..2750f4d0 100644 --- a/ext2fs/ext2fs.c +++ b/ext2fs/ext2fs.c @@ -231,8 +231,8 @@ main (int argc, char **argv) error(1, 0, "Bad device record size %d (should be %d)\n", sizes[DEV_GET_SIZE_RECORD_SIZE], DEV_BSIZE); - disk_pager_size = sizes[DEV_GET_SIZE_DEVICE_SIZE]; - assert (disk_pager_size >= SBLOCK_OFFS + SBLOCK_SIZE); + device_size = sizes[DEV_GET_SIZE_DEVICE_SIZE]; + assert (device_size >= SBLOCK_OFFS + SBLOCK_SIZE); /* Map the entire disk. */ create_disk_pager (); @@ -243,7 +243,7 @@ main (int argc, char **argv) diskfs_spawn_first_thread (); err = vm_map (mach_task_self (), (vm_address_t *)&disk_image, - disk_pager_size, 0, 1, disk_pager_port, 0, 0, + device_size, 0, 1, disk_pager_port, 0, 0, VM_PROT_READ | (diskfs_readonly ? 0 : VM_PROT_WRITE), VM_PROT_READ | (diskfs_readonly ? 0 : VM_PROT_WRITE), VM_INHERIT_NONE); @@ -251,7 +251,7 @@ main (int argc, char **argv) get_hypermetadata(); - if (disk_pager_size < sblock->s_blocks_count * block_size) + if (device_size < sblock->s_blocks_count * block_size) ext2_panic("main", "Disk size (%d) too small (superblock says we need %ld)", sizes[DEV_GET_SIZE_DEVICE_SIZE], -- cgit v1.2.3