diff options
Diffstat (limited to 'util-linux/mkfs_ext2.c')
-rw-r--r-- | util-linux/mkfs_ext2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/util-linux/mkfs_ext2.c b/util-linux/mkfs_ext2.c index 845ba0a24..d568f4be5 100644 --- a/util-linux/mkfs_ext2.c +++ b/util-linux/mkfs_ext2.c | |||
@@ -266,7 +266,7 @@ int mkfs_ext2_main(int argc UNUSED_PARAM, char **argv) | |||
266 | // N.B. what if we format a file? find_mount_point will return false negative since | 266 | // N.B. what if we format a file? find_mount_point will return false negative since |
267 | // it is loop block device which is mounted! | 267 | // it is loop block device which is mounted! |
268 | if (find_mount_point(argv[0], 0)) | 268 | if (find_mount_point(argv[0], 0)) |
269 | bb_error_msg_and_die("can't format mounted filesystem"); | 269 | bb_simple_error_msg_and_die("can't format mounted filesystem"); |
270 | 270 | ||
271 | // get size in kbytes | 271 | // get size in kbytes |
272 | kilobytes = get_volume_size_in_bytes(fd, argv[1], 1024, /*extend:*/ !(option_mask32 & OPT_n)) / 1024; | 272 | kilobytes = get_volume_size_in_bytes(fd, argv[1], 1024, /*extend:*/ !(option_mask32 & OPT_n)) / 1024; |
@@ -326,11 +326,11 @@ int mkfs_ext2_main(int argc UNUSED_PARAM, char **argv) | |||
326 | kilobytes >>= (blocksize_log2 - EXT2_MIN_BLOCK_LOG_SIZE); | 326 | kilobytes >>= (blocksize_log2 - EXT2_MIN_BLOCK_LOG_SIZE); |
327 | nblocks = kilobytes; | 327 | nblocks = kilobytes; |
328 | if (nblocks != kilobytes) | 328 | if (nblocks != kilobytes) |
329 | bb_error_msg_and_die("block count doesn't fit in 32 bits"); | 329 | bb_simple_error_msg_and_die("block count doesn't fit in 32 bits"); |
330 | #define kilobytes kilobytes_unused_after_this | 330 | #define kilobytes kilobytes_unused_after_this |
331 | // Experimentally, standard mke2fs won't work on images smaller than 60k | 331 | // Experimentally, standard mke2fs won't work on images smaller than 60k |
332 | if (nblocks < 60) | 332 | if (nblocks < 60) |
333 | bb_error_msg_and_die("need >= 60 blocks"); | 333 | bb_simple_error_msg_and_die("need >= 60 blocks"); |
334 | 334 | ||
335 | // How many reserved blocks? | 335 | // How many reserved blocks? |
336 | if (reserved_percent > 50) | 336 | if (reserved_percent > 50) |