diff options
| -rw-r--r-- | disk-utils/mkfs.minix.c | 2 | ||||
| -rw-r--r-- | tests/expected/minix/mkfs-v2i65535 | 9 | ||||
| -rwxr-xr-x | tests/ts/minix/mkfs | 1 |
3 files changed, 11 insertions, 1 deletions
diff --git a/disk-utils/mkfs.minix.c b/disk-utils/mkfs.minix.c index 613a06997..47a155c55 100644 --- a/disk-utils/mkfs.minix.c +++ b/disk-utils/mkfs.minix.c @@ -534,9 +534,9 @@ static void setup_tables(const struct fs_control *ctl) { if (fs_version == 3) Super3.s_ninodes = inodes; else { - Super.s_ninodes = inodes; if (inodes > MINIX_MAX_INODES) inodes = MINIX_MAX_INODES; + Super.s_ninodes = inodes; } super_set_map_blocks(ctl, inodes); if (MINIX_MAX_INODES < first_zone_data()) diff --git a/tests/expected/minix/mkfs-v2i65535 b/tests/expected/minix/mkfs-v2i65535 new file mode 100644 index 000000000..761a36b7f --- /dev/null +++ b/tests/expected/minix/mkfs-v2i65535 @@ -0,0 +1,9 @@ +create minix fs -2 -i 65535 +65535 inodes +10224 blocks +Firstdatazone=4107 (4107) +Zonesize=1024 +Maxsize=2147483647 + +mkfs return value: 0 +umount the image diff --git a/tests/ts/minix/mkfs b/tests/ts/minix/mkfs index 4fc6ad3e0..7af0b109a 100755 --- a/tests/ts/minix/mkfs +++ b/tests/ts/minix/mkfs @@ -49,6 +49,7 @@ mkfs_and_mount_minix 'v1c14' '-1 -n 14' mkfs_and_mount_minix 'v1c30' '-1 -n 30' mkfs_and_mount_minix 'v2c14' '-2 -n 14' mkfs_and_mount_minix 'v2c30' '-2 -n 30' +mkfs_and_mount_minix 'v2i65535' '-2 -i 65535' mkfs_and_mount_minix 'v3c60' '-3 -n 60' ts_finalize |