From: Theodore Ts'o Date: Wed, 19 Jan 2005 23:06:45 +0000 (-0500) Subject: r_resize_inode, m_dasd_bs, m_large_file, m_meta_bg, m_no_opt, X-Git-Tag: E2FSPROGS-1_36~43 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=484ae818e4dd75e304ef34ebebf4bad304e65591;p=thirdparty%2Fe2fsprogs.git r_resize_inode, m_dasd_bs, m_large_file, m_meta_bg, m_no_opt, m_read_opt, m_std, run_mke2fs, filter_dumpe2fs: Make tests portable so they pass correctly on a FreeBSD system. --- diff --git a/tests/ChangeLog b/tests/ChangeLog index 9b1cf342d..2dd764c29 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,9 @@ +2005-01-19 Theodore Ts'o + + * r_resize_inode, m_dasd_bs, m_large_file, m_meta_bg, m_no_opt, + m_read_opt, m_std, run_mke2fs, filter_dumpe2fs: Make tests + portable so they pass correctly on a FreeBSD system. + 2005-01-17 Theodore Ts'o * Makefile.in, test_script.in: Use @EGREP@ instead of grep -E for diff --git a/tests/f_resize_inode/expect b/tests/f_resize_inode/expect index 11d41a637..8e96059de 100644 --- a/tests/f_resize_inode/expect +++ b/tests/f_resize_inode/expect @@ -1,4 +1,4 @@ -mke2fs -F -O resize_inode -b 1024 -g 1024 test.img 16384 +mke2fs -F -O resize_inode -o Linux -b 1024 -g 1024 test.img 16384 Filesystem label= OS type: Linux Block size=1024 (log=0) diff --git a/tests/f_resize_inode/script b/tests/f_resize_inode/script index 3d95c7b19..bb4684f9e 100644 --- a/tests/f_resize_inode/script +++ b/tests/f_resize_inode/script @@ -12,8 +12,8 @@ cp /dev/null $OUT dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/null 2>&1 -echo mke2fs -F -O resize_inode -b 1024 -g 1024 test.img 16384 > $OUT -$MKE2FS -F -O resize_inode -b 1024 -g 1024 $TMPFILE 16384 2>&1 \ +echo mke2fs -F -O resize_inode -o Linux -b 1024 -g 1024 test.img 16384 > $OUT +$MKE2FS -F -O resize_inode -o Linux -b 1024 -g 1024 $TMPFILE 16384 2>&1 \ | sed -e '1d' | grep -v "automatically checked" | grep -v "whichever comes first" >> $OUT diff --git a/tests/filter_dumpe2fs b/tests/filter_dumpe2fs index c88abad5f..0a6e06558 100644 --- a/tests/filter_dumpe2fs +++ b/tests/filter_dumpe2fs @@ -1,6 +1,4 @@ -1a\ - -1d +1s/^.*$// /^Filesystem UUID:/d /^Filesystem created:/d /^Last write time:/d @@ -9,3 +7,5 @@ /^Directory Hash Seed:/d /^Next check after:/d /^Maximum mount count:/d +/Reserved blocks uid:/s/ (user .*)// +/Reserved blocks gid:/s/ (group .*)// diff --git a/tests/m_dasd_bs/expect.1 b/tests/m_dasd_bs/expect.1 new file mode 100644 index 000000000..9fcf3ea2f --- /dev/null +++ b/tests/m_dasd_bs/expect.1 @@ -0,0 +1,70 @@ +Filesystem label= +OS type: Linux +Block size=2048 (log=1) +Fragment size=2048 (log=1) +16384 inodes, 32768 blocks +1638 blocks (5.00%) reserved for the super user +First data block=0 +2 block groups +16384 blocks per group, 16384 fragments per group +8192 inodes per group +Superblock backups stored on blocks: + 16384 + +Writing inode tables: done +Writing superblocks and filesystem accounting information: done + +Filesystem features: filetype sparse_super + +Pass 1: Checking inodes, blocks, and sizes +Pass 2: Checking directory structure +Pass 3: Checking directory connectivity +Pass 4: Checking reference counts +Pass 5: Checking group summary information +test_filesys: 11/16384 files (0.0% non-contiguous), 1041/32768 blocks +Exit status is 0 + +Filesystem volume name: +Last mounted on: +Filesystem magic number: 0xEF53 +Filesystem revision #: 1 (dynamic) +Filesystem features: filetype sparse_super +Default mount options: (none) +Filesystem state: clean +Errors behavior: Continue +Filesystem OS type: Linux +Inode count: 16384 +Block count: 32768 +Reserved block count: 1638 +Free blocks: 31727 +Free inodes: 16373 +First block: 0 +Block size: 2048 +Fragment size: 2048 +Blocks per group: 16384 +Fragments per group: 16384 +Inodes per group: 8192 +Inode blocks per group: 512 +Mount count: 0 +Check interval: 15552000 (6 months) +Reserved blocks uid: 0 +Reserved blocks gid: 0 +First inode: 11 +Inode size: 128 +Default directory hash: tea + + +Group 0: (Blocks 0-16383) + Primary superblock at 0, Group descriptors at 1-1 + Block bitmap at 2 (+2), Inode bitmap at 3 (+3) + Inode table at 4-515 (+4) + 15859 free blocks, 8181 free inodes, 2 directories + Free blocks: 525-16383 + Free inodes: 12-8192 +Group 1: (Blocks 16384-32767) + Backup superblock at 16384, Group descriptors at 16385-16385 + Block bitmap at 16386 (+2), Inode bitmap at 16387 (+3) + Inode table at 16388-16899 (+4) + 15868 free blocks, 8192 free inodes, 0 directories + Free blocks: 16900-32767 + Free inodes: 8193-16384 diff --git a/tests/m_dasd_bs/expect.1.gz b/tests/m_dasd_bs/expect.1.gz deleted file mode 100644 index 520fc4e4f..000000000 Binary files a/tests/m_dasd_bs/expect.1.gz and /dev/null differ diff --git a/tests/m_large_file/expect.1 b/tests/m_large_file/expect.1 new file mode 100644 index 000000000..515c72316 --- /dev/null +++ b/tests/m_large_file/expect.1 @@ -0,0 +1,61 @@ +Filesystem label= +OS type: Linux +Block size=4096 (log=2) +Fragment size=4096 (log=2) +64 inodes, 16384 blocks +819 blocks (5.00%) reserved for the super user +First data block=0 +1 block group +32768 blocks per group, 32768 fragments per group +64 inodes per group + +Writing inode tables: done +Writing superblocks and filesystem accounting information: done + +Filesystem features: filetype sparse_super + +Pass 1: Checking inodes, blocks, and sizes +Pass 2: Checking directory structure +Pass 3: Checking directory connectivity +Pass 4: Checking reference counts +Pass 5: Checking group summary information +test_filesys: 11/64 files (0.0% non-contiguous), 11/16384 blocks +Exit status is 0 + +Filesystem volume name: +Last mounted on: +Filesystem magic number: 0xEF53 +Filesystem revision #: 1 (dynamic) +Filesystem features: filetype sparse_super +Default mount options: (none) +Filesystem state: clean +Errors behavior: Continue +Filesystem OS type: Linux +Inode count: 64 +Block count: 16384 +Reserved block count: 819 +Free blocks: 16373 +Free inodes: 53 +First block: 0 +Block size: 4096 +Fragment size: 4096 +Blocks per group: 32768 +Fragments per group: 32768 +Inodes per group: 64 +Inode blocks per group: 2 +Mount count: 0 +Check interval: 15552000 (6 months) +Reserved blocks uid: 0 +Reserved blocks gid: 0 +First inode: 11 +Inode size: 128 +Default directory hash: tea + + +Group 0: (Blocks 0-16383) + Primary superblock at 0, Group descriptors at 1-1 + Block bitmap at 2 (+2), Inode bitmap at 3 (+3) + Inode table at 4-5 (+4) + 16373 free blocks, 53 free inodes, 2 directories + Free blocks: 11-16383 + Free inodes: 12-64 diff --git a/tests/m_large_file/expect.1.gz b/tests/m_large_file/expect.1.gz deleted file mode 100644 index 92f790396..000000000 Binary files a/tests/m_large_file/expect.1.gz and /dev/null differ diff --git a/tests/m_meta_bg/expect.1 b/tests/m_meta_bg/expect.1 new file mode 100644 index 000000000..3414202b0 --- /dev/null +++ b/tests/m_meta_bg/expect.1 @@ -0,0 +1,845 @@ +Filesystem label= +OS type: Linux +Block size=1024 (log=0) +Fragment size=1024 (log=0) +32768 inodes, 131072 blocks +6553 blocks (5.00%) reserved for the super user +First data block=1 +128 block groups +1024 blocks per group, 1024 fragments per group +256 inodes per group +Superblock backups stored on blocks: + 1025, 3073, 5121, 7169, 9217, 25601, 27649, 50177, 82945, 128001 + +Writing inode tables: done +Writing superblocks and filesystem accounting information: done + +Filesystem features: filetype meta_bg sparse_super + +Pass 1: Checking inodes, blocks, and sizes +Pass 2: Checking directory structure +Pass 3: Checking directory connectivity +Pass 4: Checking reference counts +Pass 5: Checking group summary information +test_filesys: 11/32768 files (0.0% non-contiguous), 4389/131072 blocks +Exit status is 0 + +Filesystem volume name: +Last mounted on: +Filesystem magic number: 0xEF53 +Filesystem revision #: 1 (dynamic) +Filesystem features: filetype meta_bg sparse_super +Default mount options: (none) +Filesystem state: clean +Errors behavior: Continue +Filesystem OS type: Linux +Inode count: 32768 +Block count: 131072 +Reserved block count: 6553 +Free blocks: 126683 +Free inodes: 32757 +First block: 1 +Block size: 1024 +Fragment size: 1024 +Blocks per group: 1024 +Fragments per group: 1024 +Inodes per group: 256 +Inode blocks per group: 32 +Mount count: 0 +Check interval: 15552000 (6 months) +Reserved blocks uid: 0 +Reserved blocks gid: 0 +First inode: 11 +Inode size: 128 +Default directory hash: tea + + +Group 0: (Blocks 1-1024) + Primary superblock at 1, Group descriptor at 2 + Block bitmap at 3 (+2), Inode bitmap at 4 (+3) + Inode table at 5-36 (+4) + 975 free blocks, 245 free inodes, 2 directories + Free blocks: 50-1024 + Free inodes: 12-256 +Group 1: (Blocks 1025-2048) + Backup superblock at 1025, Group descriptor at 1026 + Block bitmap at 1027 (+2), Inode bitmap at 1028 (+3) + Inode table at 1029-1060 (+4) + 988 free blocks, 256 free inodes, 0 directories + Free blocks: 1061-2048 + Free inodes: 257-512 +Group 2: (Blocks 2049-3072) + Block bitmap at 2049 (+0), Inode bitmap at 2050 (+1) + Inode table at 2051-2082 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 2083-3072 + Free inodes: 513-768 +Group 3: (Blocks 3073-4096) + Backup superblock at 3073 + Block bitmap at 3074 (+1), Inode bitmap at 3075 (+2) + Inode table at 3076-3107 (+3) + 989 free blocks, 256 free inodes, 0 directories + Free blocks: 3108-4096 + Free inodes: 769-1024 +Group 4: (Blocks 4097-5120) + Block bitmap at 4097 (+0), Inode bitmap at 4098 (+1) + Inode table at 4099-4130 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 4131-5120 + Free inodes: 1025-1280 +Group 5: (Blocks 5121-6144) + Backup superblock at 5121 + Block bitmap at 5122 (+1), Inode bitmap at 5123 (+2) + Inode table at 5124-5155 (+3) + 989 free blocks, 256 free inodes, 0 directories + Free blocks: 5156-6144 + Free inodes: 1281-1536 +Group 6: (Blocks 6145-7168) + Block bitmap at 6145 (+0), Inode bitmap at 6146 (+1) + Inode table at 6147-6178 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 6179-7168 + Free inodes: 1537-1792 +Group 7: (Blocks 7169-8192) + Backup superblock at 7169 + Block bitmap at 7170 (+1), Inode bitmap at 7171 (+2) + Inode table at 7172-7203 (+3) + 989 free blocks, 256 free inodes, 0 directories + Free blocks: 7204-8192 + Free inodes: 1793-2048 +Group 8: (Blocks 8193-9216) + Block bitmap at 8193 (+0), Inode bitmap at 8194 (+1) + Inode table at 8195-8226 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 8227-9216 + Free inodes: 2049-2304 +Group 9: (Blocks 9217-10240) + Backup superblock at 9217 + Block bitmap at 9218 (+1), Inode bitmap at 9219 (+2) + Inode table at 9220-9251 (+3) + 989 free blocks, 256 free inodes, 0 directories + Free blocks: 9252-10240 + Free inodes: 2305-2560 +Group 10: (Blocks 10241-11264) + Block bitmap at 10241 (+0), Inode bitmap at 10242 (+1) + Inode table at 10243-10274 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 10275-11264 + Free inodes: 2561-2816 +Group 11: (Blocks 11265-12288) + Block bitmap at 11265 (+0), Inode bitmap at 11266 (+1) + Inode table at 11267-11298 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 11299-12288 + Free inodes: 2817-3072 +Group 12: (Blocks 12289-13312) + Block bitmap at 12289 (+0), Inode bitmap at 12290 (+1) + Inode table at 12291-12322 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 12323-13312 + Free inodes: 3073-3328 +Group 13: (Blocks 13313-14336) + Block bitmap at 13313 (+0), Inode bitmap at 13314 (+1) + Inode table at 13315-13346 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 13347-14336 + Free inodes: 3329-3584 +Group 14: (Blocks 14337-15360) + Block bitmap at 14337 (+0), Inode bitmap at 14338 (+1) + Inode table at 14339-14370 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 14371-15360 + Free inodes: 3585-3840 +Group 15: (Blocks 15361-16384) + Block bitmap at 15361 (+0), Inode bitmap at 15362 (+1) + Inode table at 15363-15394 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 15395-16384 + Free inodes: 3841-4096 +Group 16: (Blocks 16385-17408) + Block bitmap at 16385 (+0), Inode bitmap at 16386 (+1) + Inode table at 16387-16418 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 16419-17408 + Free inodes: 4097-4352 +Group 17: (Blocks 17409-18432) + Block bitmap at 17409 (+0), Inode bitmap at 17410 (+1) + Inode table at 17411-17442 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 17443-18432 + Free inodes: 4353-4608 +Group 18: (Blocks 18433-19456) + Block bitmap at 18433 (+0), Inode bitmap at 18434 (+1) + Inode table at 18435-18466 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 18467-19456 + Free inodes: 4609-4864 +Group 19: (Blocks 19457-20480) + Block bitmap at 19457 (+0), Inode bitmap at 19458 (+1) + Inode table at 19459-19490 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 19491-20480 + Free inodes: 4865-5120 +Group 20: (Blocks 20481-21504) + Block bitmap at 20481 (+0), Inode bitmap at 20482 (+1) + Inode table at 20483-20514 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 20515-21504 + Free inodes: 5121-5376 +Group 21: (Blocks 21505-22528) + Block bitmap at 21505 (+0), Inode bitmap at 21506 (+1) + Inode table at 21507-21538 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 21539-22528 + Free inodes: 5377-5632 +Group 22: (Blocks 22529-23552) + Block bitmap at 22529 (+0), Inode bitmap at 22530 (+1) + Inode table at 22531-22562 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 22563-23552 + Free inodes: 5633-5888 +Group 23: (Blocks 23553-24576) + Block bitmap at 23553 (+0), Inode bitmap at 23554 (+1) + Inode table at 23555-23586 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 23587-24576 + Free inodes: 5889-6144 +Group 24: (Blocks 24577-25600) + Block bitmap at 24577 (+0), Inode bitmap at 24578 (+1) + Inode table at 24579-24610 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 24611-25600 + Free inodes: 6145-6400 +Group 25: (Blocks 25601-26624) + Backup superblock at 25601 + Block bitmap at 25602 (+1), Inode bitmap at 25603 (+2) + Inode table at 25604-25635 (+3) + 989 free blocks, 256 free inodes, 0 directories + Free blocks: 25636-26624 + Free inodes: 6401-6656 +Group 26: (Blocks 26625-27648) + Block bitmap at 26625 (+0), Inode bitmap at 26626 (+1) + Inode table at 26627-26658 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 26659-27648 + Free inodes: 6657-6912 +Group 27: (Blocks 27649-28672) + Backup superblock at 27649 + Block bitmap at 27650 (+1), Inode bitmap at 27651 (+2) + Inode table at 27652-27683 (+3) + 989 free blocks, 256 free inodes, 0 directories + Free blocks: 27684-28672 + Free inodes: 6913-7168 +Group 28: (Blocks 28673-29696) + Block bitmap at 28673 (+0), Inode bitmap at 28674 (+1) + Inode table at 28675-28706 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 28707-29696 + Free inodes: 7169-7424 +Group 29: (Blocks 29697-30720) + Block bitmap at 29697 (+0), Inode bitmap at 29698 (+1) + Inode table at 29699-29730 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 29731-30720 + Free inodes: 7425-7680 +Group 30: (Blocks 30721-31744) + Block bitmap at 30721 (+0), Inode bitmap at 30722 (+1) + Inode table at 30723-30754 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 30755-31744 + Free inodes: 7681-7936 +Group 31: (Blocks 31745-32768) + Group descriptor at 31745 + Block bitmap at 31746 (+1), Inode bitmap at 31747 (+2) + Inode table at 31748-31779 (+3) + 989 free blocks, 256 free inodes, 0 directories + Free blocks: 31780-32768 + Free inodes: 7937-8192 +Group 32: (Blocks 32769-33792) + Group descriptor at 32769 + Block bitmap at 32770 (+1), Inode bitmap at 32771 (+2) + Inode table at 32772-32803 (+3) + 989 free blocks, 256 free inodes, 0 directories + Free blocks: 32804-33792 + Free inodes: 8193-8448 +Group 33: (Blocks 33793-34816) + Group descriptor at 33793 + Block bitmap at 33794 (+1), Inode bitmap at 33795 (+2) + Inode table at 33796-33827 (+3) + 989 free blocks, 256 free inodes, 0 directories + Free blocks: 33828-34816 + Free inodes: 8449-8704 +Group 34: (Blocks 34817-35840) + Block bitmap at 34817 (+0), Inode bitmap at 34818 (+1) + Inode table at 34819-34850 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 34851-35840 + Free inodes: 8705-8960 +Group 35: (Blocks 35841-36864) + Block bitmap at 35841 (+0), Inode bitmap at 35842 (+1) + Inode table at 35843-35874 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 35875-36864 + Free inodes: 8961-9216 +Group 36: (Blocks 36865-37888) + Block bitmap at 36865 (+0), Inode bitmap at 36866 (+1) + Inode table at 36867-36898 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 36899-37888 + Free inodes: 9217-9472 +Group 37: (Blocks 37889-38912) + Block bitmap at 37889 (+0), Inode bitmap at 37890 (+1) + Inode table at 37891-37922 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 37923-38912 + Free inodes: 9473-9728 +Group 38: (Blocks 38913-39936) + Block bitmap at 38913 (+0), Inode bitmap at 38914 (+1) + Inode table at 38915-38946 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 38947-39936 + Free inodes: 9729-9984 +Group 39: (Blocks 39937-40960) + Block bitmap at 39937 (+0), Inode bitmap at 39938 (+1) + Inode table at 39939-39970 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 39971-40960 + Free inodes: 9985-10240 +Group 40: (Blocks 40961-41984) + Block bitmap at 40961 (+0), Inode bitmap at 40962 (+1) + Inode table at 40963-40994 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 40995-41984 + Free inodes: 10241-10496 +Group 41: (Blocks 41985-43008) + Block bitmap at 41985 (+0), Inode bitmap at 41986 (+1) + Inode table at 41987-42018 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 42019-43008 + Free inodes: 10497-10752 +Group 42: (Blocks 43009-44032) + Block bitmap at 43009 (+0), Inode bitmap at 43010 (+1) + Inode table at 43011-43042 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 43043-44032 + Free inodes: 10753-11008 +Group 43: (Blocks 44033-45056) + Block bitmap at 44033 (+0), Inode bitmap at 44034 (+1) + Inode table at 44035-44066 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 44067-45056 + Free inodes: 11009-11264 +Group 44: (Blocks 45057-46080) + Block bitmap at 45057 (+0), Inode bitmap at 45058 (+1) + Inode table at 45059-45090 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 45091-46080 + Free inodes: 11265-11520 +Group 45: (Blocks 46081-47104) + Block bitmap at 46081 (+0), Inode bitmap at 46082 (+1) + Inode table at 46083-46114 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 46115-47104 + Free inodes: 11521-11776 +Group 46: (Blocks 47105-48128) + Block bitmap at 47105 (+0), Inode bitmap at 47106 (+1) + Inode table at 47107-47138 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 47139-48128 + Free inodes: 11777-12032 +Group 47: (Blocks 48129-49152) + Block bitmap at 48129 (+0), Inode bitmap at 48130 (+1) + Inode table at 48131-48162 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 48163-49152 + Free inodes: 12033-12288 +Group 48: (Blocks 49153-50176) + Block bitmap at 49153 (+0), Inode bitmap at 49154 (+1) + Inode table at 49155-49186 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 49187-50176 + Free inodes: 12289-12544 +Group 49: (Blocks 50177-51200) + Backup superblock at 50177 + Block bitmap at 50178 (+1), Inode bitmap at 50179 (+2) + Inode table at 50180-50211 (+3) + 989 free blocks, 256 free inodes, 0 directories + Free blocks: 50212-51200 + Free inodes: 12545-12800 +Group 50: (Blocks 51201-52224) + Block bitmap at 51201 (+0), Inode bitmap at 51202 (+1) + Inode table at 51203-51234 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 51235-52224 + Free inodes: 12801-13056 +Group 51: (Blocks 52225-53248) + Block bitmap at 52225 (+0), Inode bitmap at 52226 (+1) + Inode table at 52227-52258 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 52259-53248 + Free inodes: 13057-13312 +Group 52: (Blocks 53249-54272) + Block bitmap at 53249 (+0), Inode bitmap at 53250 (+1) + Inode table at 53251-53282 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 53283-54272 + Free inodes: 13313-13568 +Group 53: (Blocks 54273-55296) + Block bitmap at 54273 (+0), Inode bitmap at 54274 (+1) + Inode table at 54275-54306 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 54307-55296 + Free inodes: 13569-13824 +Group 54: (Blocks 55297-56320) + Block bitmap at 55297 (+0), Inode bitmap at 55298 (+1) + Inode table at 55299-55330 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 55331-56320 + Free inodes: 13825-14080 +Group 55: (Blocks 56321-57344) + Block bitmap at 56321 (+0), Inode bitmap at 56322 (+1) + Inode table at 56323-56354 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 56355-57344 + Free inodes: 14081-14336 +Group 56: (Blocks 57345-58368) + Block bitmap at 57345 (+0), Inode bitmap at 57346 (+1) + Inode table at 57347-57378 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 57379-58368 + Free inodes: 14337-14592 +Group 57: (Blocks 58369-59392) + Block bitmap at 58369 (+0), Inode bitmap at 58370 (+1) + Inode table at 58371-58402 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 58403-59392 + Free inodes: 14593-14848 +Group 58: (Blocks 59393-60416) + Block bitmap at 59393 (+0), Inode bitmap at 59394 (+1) + Inode table at 59395-59426 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 59427-60416 + Free inodes: 14849-15104 +Group 59: (Blocks 60417-61440) + Block bitmap at 60417 (+0), Inode bitmap at 60418 (+1) + Inode table at 60419-60450 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 60451-61440 + Free inodes: 15105-15360 +Group 60: (Blocks 61441-62464) + Block bitmap at 61441 (+0), Inode bitmap at 61442 (+1) + Inode table at 61443-61474 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 61475-62464 + Free inodes: 15361-15616 +Group 61: (Blocks 62465-63488) + Block bitmap at 62465 (+0), Inode bitmap at 62466 (+1) + Inode table at 62467-62498 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 62499-63488 + Free inodes: 15617-15872 +Group 62: (Blocks 63489-64512) + Block bitmap at 63489 (+0), Inode bitmap at 63490 (+1) + Inode table at 63491-63522 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 63523-64512 + Free inodes: 15873-16128 +Group 63: (Blocks 64513-65536) + Group descriptor at 64513 + Block bitmap at 64514 (+1), Inode bitmap at 64515 (+2) + Inode table at 64516-64547 (+3) + 989 free blocks, 256 free inodes, 0 directories + Free blocks: 64548-65536 + Free inodes: 16129-16384 +Group 64: (Blocks 65537-66560) + Group descriptor at 65537 + Block bitmap at 65538 (+1), Inode bitmap at 65539 (+2) + Inode table at 65540-65571 (+3) + 989 free blocks, 256 free inodes, 0 directories + Free blocks: 65572-66560 + Free inodes: 16385-16640 +Group 65: (Blocks 66561-67584) + Group descriptor at 66561 + Block bitmap at 66562 (+1), Inode bitmap at 66563 (+2) + Inode table at 66564-66595 (+3) + 989 free blocks, 256 free inodes, 0 directories + Free blocks: 66596-67584 + Free inodes: 16641-16896 +Group 66: (Blocks 67585-68608) + Block bitmap at 67585 (+0), Inode bitmap at 67586 (+1) + Inode table at 67587-67618 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 67619-68608 + Free inodes: 16897-17152 +Group 67: (Blocks 68609-69632) + Block bitmap at 68609 (+0), Inode bitmap at 68610 (+1) + Inode table at 68611-68642 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 68643-69632 + Free inodes: 17153-17408 +Group 68: (Blocks 69633-70656) + Block bitmap at 69633 (+0), Inode bitmap at 69634 (+1) + Inode table at 69635-69666 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 69667-70656 + Free inodes: 17409-17664 +Group 69: (Blocks 70657-71680) + Block bitmap at 70657 (+0), Inode bitmap at 70658 (+1) + Inode table at 70659-70690 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 70691-71680 + Free inodes: 17665-17920 +Group 70: (Blocks 71681-72704) + Block bitmap at 71681 (+0), Inode bitmap at 71682 (+1) + Inode table at 71683-71714 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 71715-72704 + Free inodes: 17921-18176 +Group 71: (Blocks 72705-73728) + Block bitmap at 72705 (+0), Inode bitmap at 72706 (+1) + Inode table at 72707-72738 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 72739-73728 + Free inodes: 18177-18432 +Group 72: (Blocks 73729-74752) + Block bitmap at 73729 (+0), Inode bitmap at 73730 (+1) + Inode table at 73731-73762 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 73763-74752 + Free inodes: 18433-18688 +Group 73: (Blocks 74753-75776) + Block bitmap at 74753 (+0), Inode bitmap at 74754 (+1) + Inode table at 74755-74786 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 74787-75776 + Free inodes: 18689-18944 +Group 74: (Blocks 75777-76800) + Block bitmap at 75777 (+0), Inode bitmap at 75778 (+1) + Inode table at 75779-75810 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 75811-76800 + Free inodes: 18945-19200 +Group 75: (Blocks 76801-77824) + Block bitmap at 76801 (+0), Inode bitmap at 76802 (+1) + Inode table at 76803-76834 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 76835-77824 + Free inodes: 19201-19456 +Group 76: (Blocks 77825-78848) + Block bitmap at 77825 (+0), Inode bitmap at 77826 (+1) + Inode table at 77827-77858 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 77859-78848 + Free inodes: 19457-19712 +Group 77: (Blocks 78849-79872) + Block bitmap at 78849 (+0), Inode bitmap at 78850 (+1) + Inode table at 78851-78882 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 78883-79872 + Free inodes: 19713-19968 +Group 78: (Blocks 79873-80896) + Block bitmap at 79873 (+0), Inode bitmap at 79874 (+1) + Inode table at 79875-79906 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 79907-80896 + Free inodes: 19969-20224 +Group 79: (Blocks 80897-81920) + Block bitmap at 80897 (+0), Inode bitmap at 80898 (+1) + Inode table at 80899-80930 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 80931-81920 + Free inodes: 20225-20480 +Group 80: (Blocks 81921-82944) + Block bitmap at 81921 (+0), Inode bitmap at 81922 (+1) + Inode table at 81923-81954 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 81955-82944 + Free inodes: 20481-20736 +Group 81: (Blocks 82945-83968) + Backup superblock at 82945 + Block bitmap at 82946 (+1), Inode bitmap at 82947 (+2) + Inode table at 82948-82979 (+3) + 989 free blocks, 256 free inodes, 0 directories + Free blocks: 82980-83968 + Free inodes: 20737-20992 +Group 82: (Blocks 83969-84992) + Block bitmap at 83969 (+0), Inode bitmap at 83970 (+1) + Inode table at 83971-84002 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 84003-84992 + Free inodes: 20993-21248 +Group 83: (Blocks 84993-86016) + Block bitmap at 84993 (+0), Inode bitmap at 84994 (+1) + Inode table at 84995-85026 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 85027-86016 + Free inodes: 21249-21504 +Group 84: (Blocks 86017-87040) + Block bitmap at 86017 (+0), Inode bitmap at 86018 (+1) + Inode table at 86019-86050 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 86051-87040 + Free inodes: 21505-21760 +Group 85: (Blocks 87041-88064) + Block bitmap at 87041 (+0), Inode bitmap at 87042 (+1) + Inode table at 87043-87074 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 87075-88064 + Free inodes: 21761-22016 +Group 86: (Blocks 88065-89088) + Block bitmap at 88065 (+0), Inode bitmap at 88066 (+1) + Inode table at 88067-88098 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 88099-89088 + Free inodes: 22017-22272 +Group 87: (Blocks 89089-90112) + Block bitmap at 89089 (+0), Inode bitmap at 89090 (+1) + Inode table at 89091-89122 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 89123-90112 + Free inodes: 22273-22528 +Group 88: (Blocks 90113-91136) + Block bitmap at 90113 (+0), Inode bitmap at 90114 (+1) + Inode table at 90115-90146 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 90147-91136 + Free inodes: 22529-22784 +Group 89: (Blocks 91137-92160) + Block bitmap at 91137 (+0), Inode bitmap at 91138 (+1) + Inode table at 91139-91170 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 91171-92160 + Free inodes: 22785-23040 +Group 90: (Blocks 92161-93184) + Block bitmap at 92161 (+0), Inode bitmap at 92162 (+1) + Inode table at 92163-92194 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 92195-93184 + Free inodes: 23041-23296 +Group 91: (Blocks 93185-94208) + Block bitmap at 93185 (+0), Inode bitmap at 93186 (+1) + Inode table at 93187-93218 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 93219-94208 + Free inodes: 23297-23552 +Group 92: (Blocks 94209-95232) + Block bitmap at 94209 (+0), Inode bitmap at 94210 (+1) + Inode table at 94211-94242 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 94243-95232 + Free inodes: 23553-23808 +Group 93: (Blocks 95233-96256) + Block bitmap at 95233 (+0), Inode bitmap at 95234 (+1) + Inode table at 95235-95266 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 95267-96256 + Free inodes: 23809-24064 +Group 94: (Blocks 96257-97280) + Block bitmap at 96257 (+0), Inode bitmap at 96258 (+1) + Inode table at 96259-96290 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 96291-97280 + Free inodes: 24065-24320 +Group 95: (Blocks 97281-98304) + Group descriptor at 97281 + Block bitmap at 97282 (+1), Inode bitmap at 97283 (+2) + Inode table at 97284-97315 (+3) + 989 free blocks, 256 free inodes, 0 directories + Free blocks: 97316-98304 + Free inodes: 24321-24576 +Group 96: (Blocks 98305-99328) + Group descriptor at 98305 + Block bitmap at 98306 (+1), Inode bitmap at 98307 (+2) + Inode table at 98308-98339 (+3) + 989 free blocks, 256 free inodes, 0 directories + Free blocks: 98340-99328 + Free inodes: 24577-24832 +Group 97: (Blocks 99329-100352) + Group descriptor at 99329 + Block bitmap at 99330 (+1), Inode bitmap at 99331 (+2) + Inode table at 99332-99363 (+3) + 989 free blocks, 256 free inodes, 0 directories + Free blocks: 99364-100352 + Free inodes: 24833-25088 +Group 98: (Blocks 100353-101376) + Block bitmap at 100353 (+0), Inode bitmap at 100354 (+1) + Inode table at 100355-100386 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 100387-101376 + Free inodes: 25089-25344 +Group 99: (Blocks 101377-102400) + Block bitmap at 101377 (+0), Inode bitmap at 101378 (+1) + Inode table at 101379-101410 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 101411-102400 + Free inodes: 25345-25600 +Group 100: (Blocks 102401-103424) + Block bitmap at 102401 (+0), Inode bitmap at 102402 (+1) + Inode table at 102403-102434 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 102435-103424 + Free inodes: 25601-25856 +Group 101: (Blocks 103425-104448) + Block bitmap at 103425 (+0), Inode bitmap at 103426 (+1) + Inode table at 103427-103458 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 103459-104448 + Free inodes: 25857-26112 +Group 102: (Blocks 104449-105472) + Block bitmap at 104449 (+0), Inode bitmap at 104450 (+1) + Inode table at 104451-104482 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 104483-105472 + Free inodes: 26113-26368 +Group 103: (Blocks 105473-106496) + Block bitmap at 105473 (+0), Inode bitmap at 105474 (+1) + Inode table at 105475-105506 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 105507-106496 + Free inodes: 26369-26624 +Group 104: (Blocks 106497-107520) + Block bitmap at 106497 (+0), Inode bitmap at 106498 (+1) + Inode table at 106499-106530 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 106531-107520 + Free inodes: 26625-26880 +Group 105: (Blocks 107521-108544) + Block bitmap at 107521 (+0), Inode bitmap at 107522 (+1) + Inode table at 107523-107554 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 107555-108544 + Free inodes: 26881-27136 +Group 106: (Blocks 108545-109568) + Block bitmap at 108545 (+0), Inode bitmap at 108546 (+1) + Inode table at 108547-108578 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 108579-109568 + Free inodes: 27137-27392 +Group 107: (Blocks 109569-110592) + Block bitmap at 109569 (+0), Inode bitmap at 109570 (+1) + Inode table at 109571-109602 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 109603-110592 + Free inodes: 27393-27648 +Group 108: (Blocks 110593-111616) + Block bitmap at 110593 (+0), Inode bitmap at 110594 (+1) + Inode table at 110595-110626 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 110627-111616 + Free inodes: 27649-27904 +Group 109: (Blocks 111617-112640) + Block bitmap at 111617 (+0), Inode bitmap at 111618 (+1) + Inode table at 111619-111650 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 111651-112640 + Free inodes: 27905-28160 +Group 110: (Blocks 112641-113664) + Block bitmap at 112641 (+0), Inode bitmap at 112642 (+1) + Inode table at 112643-112674 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 112675-113664 + Free inodes: 28161-28416 +Group 111: (Blocks 113665-114688) + Block bitmap at 113665 (+0), Inode bitmap at 113666 (+1) + Inode table at 113667-113698 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 113699-114688 + Free inodes: 28417-28672 +Group 112: (Blocks 114689-115712) + Block bitmap at 114689 (+0), Inode bitmap at 114690 (+1) + Inode table at 114691-114722 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 114723-115712 + Free inodes: 28673-28928 +Group 113: (Blocks 115713-116736) + Block bitmap at 115713 (+0), Inode bitmap at 115714 (+1) + Inode table at 115715-115746 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 115747-116736 + Free inodes: 28929-29184 +Group 114: (Blocks 116737-117760) + Block bitmap at 116737 (+0), Inode bitmap at 116738 (+1) + Inode table at 116739-116770 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 116771-117760 + Free inodes: 29185-29440 +Group 115: (Blocks 117761-118784) + Block bitmap at 117761 (+0), Inode bitmap at 117762 (+1) + Inode table at 117763-117794 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 117795-118784 + Free inodes: 29441-29696 +Group 116: (Blocks 118785-119808) + Block bitmap at 118785 (+0), Inode bitmap at 118786 (+1) + Inode table at 118787-118818 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 118819-119808 + Free inodes: 29697-29952 +Group 117: (Blocks 119809-120832) + Block bitmap at 119809 (+0), Inode bitmap at 119810 (+1) + Inode table at 119811-119842 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 119843-120832 + Free inodes: 29953-30208 +Group 118: (Blocks 120833-121856) + Block bitmap at 120833 (+0), Inode bitmap at 120834 (+1) + Inode table at 120835-120866 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 120867-121856 + Free inodes: 30209-30464 +Group 119: (Blocks 121857-122880) + Block bitmap at 121857 (+0), Inode bitmap at 121858 (+1) + Inode table at 121859-121890 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 121891-122880 + Free inodes: 30465-30720 +Group 120: (Blocks 122881-123904) + Block bitmap at 122881 (+0), Inode bitmap at 122882 (+1) + Inode table at 122883-122914 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 122915-123904 + Free inodes: 30721-30976 +Group 121: (Blocks 123905-124928) + Block bitmap at 123905 (+0), Inode bitmap at 123906 (+1) + Inode table at 123907-123938 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 123939-124928 + Free inodes: 30977-31232 +Group 122: (Blocks 124929-125952) + Block bitmap at 124929 (+0), Inode bitmap at 124930 (+1) + Inode table at 124931-124962 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 124963-125952 + Free inodes: 31233-31488 +Group 123: (Blocks 125953-126976) + Block bitmap at 125953 (+0), Inode bitmap at 125954 (+1) + Inode table at 125955-125986 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 125987-126976 + Free inodes: 31489-31744 +Group 124: (Blocks 126977-128000) + Block bitmap at 126977 (+0), Inode bitmap at 126978 (+1) + Inode table at 126979-127010 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 127011-128000 + Free inodes: 31745-32000 +Group 125: (Blocks 128001-129024) + Backup superblock at 128001 + Block bitmap at 128002 (+1), Inode bitmap at 128003 (+2) + Inode table at 128004-128035 (+3) + 989 free blocks, 256 free inodes, 0 directories + Free blocks: 128036-129024 + Free inodes: 32001-32256 +Group 126: (Blocks 129025-130048) + Block bitmap at 129025 (+0), Inode bitmap at 129026 (+1) + Inode table at 129027-129058 (+2) + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 129059-130048 + Free inodes: 32257-32512 +Group 127: (Blocks 130049-131071) + Group descriptor at 130049 + Block bitmap at 130050 (+1), Inode bitmap at 130051 (+2) + Inode table at 130052-130083 (+3) + 988 free blocks, 256 free inodes, 0 directories + Free blocks: 130084-131071 + Free inodes: 32513-32768 diff --git a/tests/m_meta_bg/expect.1.gz b/tests/m_meta_bg/expect.1.gz deleted file mode 100644 index 595ef6242..000000000 Binary files a/tests/m_meta_bg/expect.1.gz and /dev/null differ diff --git a/tests/m_no_opt/expect.1 b/tests/m_no_opt/expect.1 new file mode 100644 index 000000000..cec95afa9 --- /dev/null +++ b/tests/m_no_opt/expect.1 @@ -0,0 +1,112 @@ +Filesystem label= +OS type: Linux +Block size=1024 (log=0) +Fragment size=1024 (log=0) +16384 inodes, 65536 blocks +3276 blocks (5.00%) reserved for the super user +First data block=1 +8 block groups +8192 blocks per group, 8192 fragments per group +2048 inodes per group +Superblock backups stored on blocks: + 8193, 16385, 24577, 32769, 40961, 49153, 57345 + +Writing inode tables: done +Writing superblocks and filesystem accounting information: done + +Filesystem features:(none) + +Pass 1: Checking inodes, blocks, and sizes +Pass 2: Checking directory structure +Pass 3: Checking directory connectivity +Pass 4: Checking reference counts +Pass 5: Checking group summary information +test_filesys: 11/16384 files (0.0% non-contiguous), 2094/65536 blocks +Exit status is 0 + +Filesystem volume name: +Last mounted on: +Filesystem magic number: 0xEF53 +Filesystem revision #: 1 (dynamic) +Filesystem features: (none) +Default mount options: (none) +Filesystem state: clean +Errors behavior: Continue +Filesystem OS type: Linux +Inode count: 16384 +Block count: 65536 +Reserved block count: 3276 +Free blocks: 63442 +Free inodes: 16373 +First block: 1 +Block size: 1024 +Fragment size: 1024 +Blocks per group: 8192 +Fragments per group: 8192 +Inodes per group: 2048 +Inode blocks per group: 256 +Mount count: 0 +Check interval: 15552000 (6 months) +Reserved blocks uid: 0 +Reserved blocks gid: 0 +First inode: 11 +Inode size: 128 +Default directory hash: tea + + +Group 0: (Blocks 1-8192) + Primary superblock at 1, Group descriptors at 2-2 + Block bitmap at 3 (+2), Inode bitmap at 4 (+3) + Inode table at 5-260 (+4) + 7919 free blocks, 2037 free inodes, 2 directories + Free blocks: 274-8192 + Free inodes: 12-2048 +Group 1: (Blocks 8193-16384) + Backup superblock at 8193, Group descriptors at 8194-8194 + Block bitmap at 8195 (+2), Inode bitmap at 8196 (+3) + Inode table at 8197-8452 (+4) + 7932 free blocks, 2048 free inodes, 0 directories + Free blocks: 8453-16384 + Free inodes: 2049-4096 +Group 2: (Blocks 16385-24576) + Backup superblock at 16385, Group descriptors at 16386-16386 + Block bitmap at 16387 (+2), Inode bitmap at 16388 (+3) + Inode table at 16389-16644 (+4) + 7932 free blocks, 2048 free inodes, 0 directories + Free blocks: 16645-24576 + Free inodes: 4097-6144 +Group 3: (Blocks 24577-32768) + Backup superblock at 24577, Group descriptors at 24578-24578 + Block bitmap at 24579 (+2), Inode bitmap at 24580 (+3) + Inode table at 24581-24836 (+4) + 7932 free blocks, 2048 free inodes, 0 directories + Free blocks: 24837-32768 + Free inodes: 6145-8192 +Group 4: (Blocks 32769-40960) + Backup superblock at 32769, Group descriptors at 32770-32770 + Block bitmap at 32771 (+2), Inode bitmap at 32772 (+3) + Inode table at 32773-33028 (+4) + 7932 free blocks, 2048 free inodes, 0 directories + Free blocks: 33029-40960 + Free inodes: 8193-10240 +Group 5: (Blocks 40961-49152) + Backup superblock at 40961, Group descriptors at 40962-40962 + Block bitmap at 40963 (+2), Inode bitmap at 40964 (+3) + Inode table at 40965-41220 (+4) + 7932 free blocks, 2048 free inodes, 0 directories + Free blocks: 41221-49152 + Free inodes: 10241-12288 +Group 6: (Blocks 49153-57344) + Backup superblock at 49153, Group descriptors at 49154-49154 + Block bitmap at 49155 (+2), Inode bitmap at 49156 (+3) + Inode table at 49157-49412 (+4) + 7932 free blocks, 2048 free inodes, 0 directories + Free blocks: 49413-57344 + Free inodes: 12289-14336 +Group 7: (Blocks 57345-65535) + Backup superblock at 57345, Group descriptors at 57346-57346 + Block bitmap at 57347 (+2), Inode bitmap at 57348 (+3) + Inode table at 57349-57604 (+4) + 7931 free blocks, 2048 free inodes, 0 directories + Free blocks: 57605-65535 + Free inodes: 14337-16384 diff --git a/tests/m_no_opt/expect.1.gz b/tests/m_no_opt/expect.1.gz deleted file mode 100644 index 48cd6967b..000000000 Binary files a/tests/m_no_opt/expect.1.gz and /dev/null differ diff --git a/tests/m_raid_opt/expect.1 b/tests/m_raid_opt/expect.1 new file mode 100644 index 000000000..6df7f07d1 --- /dev/null +++ b/tests/m_raid_opt/expect.1 @@ -0,0 +1,845 @@ +Filesystem label= +OS type: Linux +Block size=1024 (log=0) +Fragment size=1024 (log=0) +32768 inodes, 131072 blocks +6553 blocks (5.00%) reserved for the super user +First data block=1 +128 block groups +1024 blocks per group, 1024 fragments per group +256 inodes per group +Superblock backups stored on blocks: + 1025, 3073, 5121, 7169, 9217, 25601, 27649, 50177, 82945, 128001 + +Writing inode tables: done +Writing superblocks and filesystem accounting information: done + +Filesystem features: filetype meta_bg sparse_super + +Pass 1: Checking inodes, blocks, and sizes +Pass 2: Checking directory structure +Pass 3: Checking directory connectivity +Pass 4: Checking reference counts +Pass 5: Checking group summary information +test_filesys: 11/32768 files (0.0% non-contiguous), 4389/131072 blocks +Exit status is 0 + +Filesystem volume name: +Last mounted on: +Filesystem magic number: 0xEF53 +Filesystem revision #: 1 (dynamic) +Filesystem features: filetype meta_bg sparse_super +Default mount options: (none) +Filesystem state: clean +Errors behavior: Continue +Filesystem OS type: Linux +Inode count: 32768 +Block count: 131072 +Reserved block count: 6553 +Free blocks: 126683 +Free inodes: 32757 +First block: 1 +Block size: 1024 +Fragment size: 1024 +Blocks per group: 1024 +Fragments per group: 1024 +Inodes per group: 256 +Inode blocks per group: 32 +Mount count: 0 +Check interval: 15552000 (6 months) +Reserved blocks uid: 0 +Reserved blocks gid: 0 +First inode: 11 +Inode size: 128 +Default directory hash: tea + + +Group 0: (Blocks 1-1024) + Primary superblock at 1, Group descriptor at 2 + Block bitmap at 33 (+32), Inode bitmap at 34 (+33) + Inode table at 35-66 (+34) + 975 free blocks, 245 free inodes, 2 directories + Free blocks: 16-32, 67-1024 + Free inodes: 12-256 +Group 1: (Blocks 1025-2048) + Backup superblock at 1025, Group descriptor at 1026 + Block bitmap at 1070 (+45), Inode bitmap at 1071 (+46) + Inode table at 1027-1058 (+2) + 988 free blocks, 256 free inodes, 0 directories + Free blocks: 1059-1069, 1072-2048 + Free inodes: 257-512 +Group 2: (Blocks 2049-3072) + Block bitmap at 2107 (+58), Inode bitmap at 2108 (+59) + Inode table at 2049-2080 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 2081-2106, 2109-3072 + Free inodes: 513-768 +Group 3: (Blocks 3073-4096) + Backup superblock at 3073 + Block bitmap at 3144 (+71), Inode bitmap at 3145 (+72) + Inode table at 3074-3105 (+1) + 989 free blocks, 256 free inodes, 0 directories + Free blocks: 3106-3143, 3146-4096 + Free inodes: 769-1024 +Group 4: (Blocks 4097-5120) + Block bitmap at 4181 (+84), Inode bitmap at 4182 (+85) + Inode table at 4097-4128 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 4129-4180, 4183-5120 + Free inodes: 1025-1280 +Group 5: (Blocks 5121-6144) + Backup superblock at 5121 + Block bitmap at 5218 (+97), Inode bitmap at 5219 (+98) + Inode table at 5122-5153 (+1) + 989 free blocks, 256 free inodes, 0 directories + Free blocks: 5154-5217, 5220-6144 + Free inodes: 1281-1536 +Group 6: (Blocks 6145-7168) + Block bitmap at 6255 (+110), Inode bitmap at 6256 (+111) + Inode table at 6145-6176 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 6177-6254, 6257-7168 + Free inodes: 1537-1792 +Group 7: (Blocks 7169-8192) + Backup superblock at 7169 + Block bitmap at 7292 (+123), Inode bitmap at 7293 (+124) + Inode table at 7170-7201 (+1) + 989 free blocks, 256 free inodes, 0 directories + Free blocks: 7202-7291, 7294-8192 + Free inodes: 1793-2048 +Group 8: (Blocks 8193-9216) + Block bitmap at 8329 (+136), Inode bitmap at 8330 (+137) + Inode table at 8193-8224 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 8225-8328, 8331-9216 + Free inodes: 2049-2304 +Group 9: (Blocks 9217-10240) + Backup superblock at 9217 + Block bitmap at 9366 (+149), Inode bitmap at 9367 (+150) + Inode table at 9218-9249 (+1) + 989 free blocks, 256 free inodes, 0 directories + Free blocks: 9250-9365, 9368-10240 + Free inodes: 2305-2560 +Group 10: (Blocks 10241-11264) + Block bitmap at 10403 (+162), Inode bitmap at 10404 (+163) + Inode table at 10241-10272 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 10273-10402, 10405-11264 + Free inodes: 2561-2816 +Group 11: (Blocks 11265-12288) + Block bitmap at 11440 (+175), Inode bitmap at 11441 (+176) + Inode table at 11265-11296 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 11297-11439, 11442-12288 + Free inodes: 2817-3072 +Group 12: (Blocks 12289-13312) + Block bitmap at 12477 (+188), Inode bitmap at 12478 (+189) + Inode table at 12289-12320 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 12321-12476, 12479-13312 + Free inodes: 3073-3328 +Group 13: (Blocks 13313-14336) + Block bitmap at 13514 (+201), Inode bitmap at 13515 (+202) + Inode table at 13313-13344 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 13345-13513, 13516-14336 + Free inodes: 3329-3584 +Group 14: (Blocks 14337-15360) + Block bitmap at 14551 (+214), Inode bitmap at 14552 (+215) + Inode table at 14337-14368 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 14369-14550, 14553-15360 + Free inodes: 3585-3840 +Group 15: (Blocks 15361-16384) + Block bitmap at 15588 (+227), Inode bitmap at 15589 (+228) + Inode table at 15361-15392 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 15393-15587, 15590-16384 + Free inodes: 3841-4096 +Group 16: (Blocks 16385-17408) + Block bitmap at 16625 (+240), Inode bitmap at 16626 (+241) + Inode table at 16385-16416 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 16417-16624, 16627-17408 + Free inodes: 4097-4352 +Group 17: (Blocks 17409-18432) + Block bitmap at 17662 (+253), Inode bitmap at 17663 (+254) + Inode table at 17409-17440 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 17441-17661, 17664-18432 + Free inodes: 4353-4608 +Group 18: (Blocks 18433-19456) + Block bitmap at 18699 (+266), Inode bitmap at 18700 (+267) + Inode table at 18433-18464 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 18465-18698, 18701-19456 + Free inodes: 4609-4864 +Group 19: (Blocks 19457-20480) + Block bitmap at 19736 (+279), Inode bitmap at 19737 (+280) + Inode table at 19457-19488 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 19489-19735, 19738-20480 + Free inodes: 4865-5120 +Group 20: (Blocks 20481-21504) + Block bitmap at 20773 (+292), Inode bitmap at 20774 (+293) + Inode table at 20481-20512 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 20513-20772, 20775-21504 + Free inodes: 5121-5376 +Group 21: (Blocks 21505-22528) + Block bitmap at 21810 (+305), Inode bitmap at 21811 (+306) + Inode table at 21505-21536 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 21537-21809, 21812-22528 + Free inodes: 5377-5632 +Group 22: (Blocks 22529-23552) + Block bitmap at 22847 (+318), Inode bitmap at 22848 (+319) + Inode table at 22529-22560 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 22561-22846, 22849-23552 + Free inodes: 5633-5888 +Group 23: (Blocks 23553-24576) + Block bitmap at 23884 (+331), Inode bitmap at 23885 (+332) + Inode table at 23553-23584 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 23585-23883, 23886-24576 + Free inodes: 5889-6144 +Group 24: (Blocks 24577-25600) + Block bitmap at 24921 (+344), Inode bitmap at 24922 (+345) + Inode table at 24577-24608 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 24609-24920, 24923-25600 + Free inodes: 6145-6400 +Group 25: (Blocks 25601-26624) + Backup superblock at 25601 + Block bitmap at 25958 (+357), Inode bitmap at 25959 (+358) + Inode table at 25602-25633 (+1) + 989 free blocks, 256 free inodes, 0 directories + Free blocks: 25634-25957, 25960-26624 + Free inodes: 6401-6656 +Group 26: (Blocks 26625-27648) + Block bitmap at 26995 (+370), Inode bitmap at 26996 (+371) + Inode table at 26625-26656 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 26657-26994, 26997-27648 + Free inodes: 6657-6912 +Group 27: (Blocks 27649-28672) + Backup superblock at 27649 + Block bitmap at 28032 (+383), Inode bitmap at 28033 (+384) + Inode table at 27650-27681 (+1) + 989 free blocks, 256 free inodes, 0 directories + Free blocks: 27682-28031, 28034-28672 + Free inodes: 6913-7168 +Group 28: (Blocks 28673-29696) + Block bitmap at 29069 (+396), Inode bitmap at 29070 (+397) + Inode table at 28673-28704 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 28705-29068, 29071-29696 + Free inodes: 7169-7424 +Group 29: (Blocks 29697-30720) + Block bitmap at 30106 (+409), Inode bitmap at 30107 (+410) + Inode table at 29697-29728 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 29729-30105, 30108-30720 + Free inodes: 7425-7680 +Group 30: (Blocks 30721-31744) + Block bitmap at 31143 (+422), Inode bitmap at 31144 (+423) + Inode table at 30721-30752 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 30753-31142, 31145-31744 + Free inodes: 7681-7936 +Group 31: (Blocks 31745-32768) + Group descriptor at 31745 + Block bitmap at 32180 (+435), Inode bitmap at 32181 (+436) + Inode table at 31746-31777 (+1) + 989 free blocks, 256 free inodes, 0 directories + Free blocks: 31778-32179, 32182-32768 + Free inodes: 7937-8192 +Group 32: (Blocks 32769-33792) + Group descriptor at 32769 + Block bitmap at 33217 (+448), Inode bitmap at 33218 (+449) + Inode table at 32770-32801 (+1) + 989 free blocks, 256 free inodes, 0 directories + Free blocks: 32802-33216, 33219-33792 + Free inodes: 8193-8448 +Group 33: (Blocks 33793-34816) + Group descriptor at 33793 + Block bitmap at 34254 (+461), Inode bitmap at 34255 (+462) + Inode table at 33794-33825 (+1) + 989 free blocks, 256 free inodes, 0 directories + Free blocks: 33826-34253, 34256-34816 + Free inodes: 8449-8704 +Group 34: (Blocks 34817-35840) + Block bitmap at 35291 (+474), Inode bitmap at 35292 (+475) + Inode table at 34817-34848 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 34849-35290, 35293-35840 + Free inodes: 8705-8960 +Group 35: (Blocks 35841-36864) + Block bitmap at 36328 (+487), Inode bitmap at 36329 (+488) + Inode table at 35841-35872 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 35873-36327, 36330-36864 + Free inodes: 8961-9216 +Group 36: (Blocks 36865-37888) + Block bitmap at 37365 (+500), Inode bitmap at 37366 (+501) + Inode table at 36865-36896 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 36897-37364, 37367-37888 + Free inodes: 9217-9472 +Group 37: (Blocks 37889-38912) + Block bitmap at 38402 (+513), Inode bitmap at 38403 (+514) + Inode table at 37889-37920 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 37921-38401, 38404-38912 + Free inodes: 9473-9728 +Group 38: (Blocks 38913-39936) + Block bitmap at 39439 (+526), Inode bitmap at 39440 (+527) + Inode table at 38913-38944 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 38945-39438, 39441-39936 + Free inodes: 9729-9984 +Group 39: (Blocks 39937-40960) + Block bitmap at 40476 (+539), Inode bitmap at 40477 (+540) + Inode table at 39937-39968 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 39969-40475, 40478-40960 + Free inodes: 9985-10240 +Group 40: (Blocks 40961-41984) + Block bitmap at 41513 (+552), Inode bitmap at 41514 (+553) + Inode table at 40961-40992 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 40993-41512, 41515-41984 + Free inodes: 10241-10496 +Group 41: (Blocks 41985-43008) + Block bitmap at 42550 (+565), Inode bitmap at 42551 (+566) + Inode table at 41985-42016 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 42017-42549, 42552-43008 + Free inodes: 10497-10752 +Group 42: (Blocks 43009-44032) + Block bitmap at 43587 (+578), Inode bitmap at 43588 (+579) + Inode table at 43009-43040 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 43041-43586, 43589-44032 + Free inodes: 10753-11008 +Group 43: (Blocks 44033-45056) + Block bitmap at 44624 (+591), Inode bitmap at 44625 (+592) + Inode table at 44033-44064 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 44065-44623, 44626-45056 + Free inodes: 11009-11264 +Group 44: (Blocks 45057-46080) + Block bitmap at 45661 (+604), Inode bitmap at 45662 (+605) + Inode table at 45057-45088 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 45089-45660, 45663-46080 + Free inodes: 11265-11520 +Group 45: (Blocks 46081-47104) + Block bitmap at 46698 (+617), Inode bitmap at 46699 (+618) + Inode table at 46081-46112 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 46113-46697, 46700-47104 + Free inodes: 11521-11776 +Group 46: (Blocks 47105-48128) + Block bitmap at 47735 (+630), Inode bitmap at 47736 (+631) + Inode table at 47105-47136 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 47137-47734, 47737-48128 + Free inodes: 11777-12032 +Group 47: (Blocks 48129-49152) + Block bitmap at 48772 (+643), Inode bitmap at 48773 (+644) + Inode table at 48129-48160 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 48161-48771, 48774-49152 + Free inodes: 12033-12288 +Group 48: (Blocks 49153-50176) + Block bitmap at 49809 (+656), Inode bitmap at 49810 (+657) + Inode table at 49153-49184 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 49185-49808, 49811-50176 + Free inodes: 12289-12544 +Group 49: (Blocks 50177-51200) + Backup superblock at 50177 + Block bitmap at 50846 (+669), Inode bitmap at 50847 (+670) + Inode table at 50178-50209 (+1) + 989 free blocks, 256 free inodes, 0 directories + Free blocks: 50210-50845, 50848-51200 + Free inodes: 12545-12800 +Group 50: (Blocks 51201-52224) + Block bitmap at 51883 (+682), Inode bitmap at 51884 (+683) + Inode table at 51201-51232 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 51233-51882, 51885-52224 + Free inodes: 12801-13056 +Group 51: (Blocks 52225-53248) + Block bitmap at 52920 (+695), Inode bitmap at 52921 (+696) + Inode table at 52225-52256 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 52257-52919, 52922-53248 + Free inodes: 13057-13312 +Group 52: (Blocks 53249-54272) + Block bitmap at 53957 (+708), Inode bitmap at 53958 (+709) + Inode table at 53249-53280 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 53281-53956, 53959-54272 + Free inodes: 13313-13568 +Group 53: (Blocks 54273-55296) + Block bitmap at 54994 (+721), Inode bitmap at 54995 (+722) + Inode table at 54273-54304 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 54305-54993, 54996-55296 + Free inodes: 13569-13824 +Group 54: (Blocks 55297-56320) + Block bitmap at 56031 (+734), Inode bitmap at 56032 (+735) + Inode table at 55297-55328 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 55329-56030, 56033-56320 + Free inodes: 13825-14080 +Group 55: (Blocks 56321-57344) + Block bitmap at 57068 (+747), Inode bitmap at 57069 (+748) + Inode table at 56321-56352 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 56353-57067, 57070-57344 + Free inodes: 14081-14336 +Group 56: (Blocks 57345-58368) + Block bitmap at 58105 (+760), Inode bitmap at 58106 (+761) + Inode table at 57345-57376 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 57377-58104, 58107-58368 + Free inodes: 14337-14592 +Group 57: (Blocks 58369-59392) + Block bitmap at 59142 (+773), Inode bitmap at 59143 (+774) + Inode table at 58369-58400 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 58401-59141, 59144-59392 + Free inodes: 14593-14848 +Group 58: (Blocks 59393-60416) + Block bitmap at 60179 (+786), Inode bitmap at 60180 (+787) + Inode table at 59393-59424 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 59425-60178, 60181-60416 + Free inodes: 14849-15104 +Group 59: (Blocks 60417-61440) + Block bitmap at 61216 (+799), Inode bitmap at 61217 (+800) + Inode table at 60417-60448 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 60449-61215, 61218-61440 + Free inodes: 15105-15360 +Group 60: (Blocks 61441-62464) + Block bitmap at 62253 (+812), Inode bitmap at 62254 (+813) + Inode table at 61441-61472 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 61473-62252, 62255-62464 + Free inodes: 15361-15616 +Group 61: (Blocks 62465-63488) + Block bitmap at 63290 (+825), Inode bitmap at 63291 (+826) + Inode table at 62465-62496 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 62497-63289, 63292-63488 + Free inodes: 15617-15872 +Group 62: (Blocks 63489-64512) + Block bitmap at 64327 (+838), Inode bitmap at 64328 (+839) + Inode table at 63489-63520 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 63521-64326, 64329-64512 + Free inodes: 15873-16128 +Group 63: (Blocks 64513-65536) + Group descriptor at 64513 + Block bitmap at 65364 (+851), Inode bitmap at 65365 (+852) + Inode table at 64514-64545 (+1) + 989 free blocks, 256 free inodes, 0 directories + Free blocks: 64546-65363, 65366-65536 + Free inodes: 16129-16384 +Group 64: (Blocks 65537-66560) + Group descriptor at 65537 + Block bitmap at 66401 (+864), Inode bitmap at 66402 (+865) + Inode table at 65538-65569 (+1) + 989 free blocks, 256 free inodes, 0 directories + Free blocks: 65570-66400, 66403-66560 + Free inodes: 16385-16640 +Group 65: (Blocks 66561-67584) + Group descriptor at 66561 + Block bitmap at 67438 (+877), Inode bitmap at 67439 (+878) + Inode table at 66562-66593 (+1) + 989 free blocks, 256 free inodes, 0 directories + Free blocks: 66594-67437, 67440-67584 + Free inodes: 16641-16896 +Group 66: (Blocks 67585-68608) + Block bitmap at 68475 (+890), Inode bitmap at 68476 (+891) + Inode table at 67585-67616 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 67617-68474, 68477-68608 + Free inodes: 16897-17152 +Group 67: (Blocks 68609-69632) + Block bitmap at 69512 (+903), Inode bitmap at 69513 (+904) + Inode table at 68609-68640 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 68641-69511, 69514-69632 + Free inodes: 17153-17408 +Group 68: (Blocks 69633-70656) + Block bitmap at 70549 (+916), Inode bitmap at 70550 (+917) + Inode table at 69633-69664 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 69665-70548, 70551-70656 + Free inodes: 17409-17664 +Group 69: (Blocks 70657-71680) + Block bitmap at 71586 (+929), Inode bitmap at 71587 (+930) + Inode table at 70657-70688 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 70689-71585, 71588-71680 + Free inodes: 17665-17920 +Group 70: (Blocks 71681-72704) + Block bitmap at 72623 (+942), Inode bitmap at 72624 (+943) + Inode table at 71681-71712 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 71713-72622, 72625-72704 + Free inodes: 17921-18176 +Group 71: (Blocks 72705-73728) + Block bitmap at 73660 (+955), Inode bitmap at 73661 (+956) + Inode table at 72705-72736 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 72737-73659, 73662-73728 + Free inodes: 18177-18432 +Group 72: (Blocks 73729-74752) + Block bitmap at 74697 (+968), Inode bitmap at 74698 (+969) + Inode table at 73729-73760 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 73761-74696, 74699-74752 + Free inodes: 18433-18688 +Group 73: (Blocks 74753-75776) + Block bitmap at 75734 (+981), Inode bitmap at 75735 (+982) + Inode table at 74753-74784 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 74785-75733, 75736-75776 + Free inodes: 18689-18944 +Group 74: (Blocks 75777-76800) + Block bitmap at 76771 (+994), Inode bitmap at 76772 (+995) + Inode table at 75777-75808 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 75809-76770, 76773-76800 + Free inodes: 18945-19200 +Group 75: (Blocks 76801-77824) + Block bitmap at 77808 (+1007), Inode bitmap at 77809 (+1008) + Inode table at 76801-76832 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 76833-77807, 77810-77824 + Free inodes: 19201-19456 +Group 76: (Blocks 77825-78848) + Block bitmap at 78845 (+1020), Inode bitmap at 78846 (+1021) + Inode table at 77825-77856 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 77857-78844, 78847-78848 + Free inodes: 19457-19712 +Group 77: (Blocks 78849-79872) + Block bitmap at 78890 (+41), Inode bitmap at 78891 (+42) + Inode table at 78849-78880 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 78881-78889, 78892-79872 + Free inodes: 19713-19968 +Group 78: (Blocks 79873-80896) + Block bitmap at 79927 (+54), Inode bitmap at 79928 (+55) + Inode table at 79873-79904 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 79905-79926, 79929-80896 + Free inodes: 19969-20224 +Group 79: (Blocks 80897-81920) + Block bitmap at 80964 (+67), Inode bitmap at 80965 (+68) + Inode table at 80897-80928 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 80929-80963, 80966-81920 + Free inodes: 20225-20480 +Group 80: (Blocks 81921-82944) + Block bitmap at 82001 (+80), Inode bitmap at 82002 (+81) + Inode table at 81921-81952 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 81953-82000, 82003-82944 + Free inodes: 20481-20736 +Group 81: (Blocks 82945-83968) + Backup superblock at 82945 + Block bitmap at 83038 (+93), Inode bitmap at 83039 (+94) + Inode table at 82946-82977 (+1) + 989 free blocks, 256 free inodes, 0 directories + Free blocks: 82978-83037, 83040-83968 + Free inodes: 20737-20992 +Group 82: (Blocks 83969-84992) + Block bitmap at 84075 (+106), Inode bitmap at 84076 (+107) + Inode table at 83969-84000 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 84001-84074, 84077-84992 + Free inodes: 20993-21248 +Group 83: (Blocks 84993-86016) + Block bitmap at 85112 (+119), Inode bitmap at 85113 (+120) + Inode table at 84993-85024 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 85025-85111, 85114-86016 + Free inodes: 21249-21504 +Group 84: (Blocks 86017-87040) + Block bitmap at 86149 (+132), Inode bitmap at 86150 (+133) + Inode table at 86017-86048 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 86049-86148, 86151-87040 + Free inodes: 21505-21760 +Group 85: (Blocks 87041-88064) + Block bitmap at 87186 (+145), Inode bitmap at 87187 (+146) + Inode table at 87041-87072 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 87073-87185, 87188-88064 + Free inodes: 21761-22016 +Group 86: (Blocks 88065-89088) + Block bitmap at 88223 (+158), Inode bitmap at 88224 (+159) + Inode table at 88065-88096 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 88097-88222, 88225-89088 + Free inodes: 22017-22272 +Group 87: (Blocks 89089-90112) + Block bitmap at 89260 (+171), Inode bitmap at 89261 (+172) + Inode table at 89089-89120 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 89121-89259, 89262-90112 + Free inodes: 22273-22528 +Group 88: (Blocks 90113-91136) + Block bitmap at 90297 (+184), Inode bitmap at 90298 (+185) + Inode table at 90113-90144 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 90145-90296, 90299-91136 + Free inodes: 22529-22784 +Group 89: (Blocks 91137-92160) + Block bitmap at 91334 (+197), Inode bitmap at 91335 (+198) + Inode table at 91137-91168 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 91169-91333, 91336-92160 + Free inodes: 22785-23040 +Group 90: (Blocks 92161-93184) + Block bitmap at 92371 (+210), Inode bitmap at 92372 (+211) + Inode table at 92161-92192 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 92193-92370, 92373-93184 + Free inodes: 23041-23296 +Group 91: (Blocks 93185-94208) + Block bitmap at 93408 (+223), Inode bitmap at 93409 (+224) + Inode table at 93185-93216 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 93217-93407, 93410-94208 + Free inodes: 23297-23552 +Group 92: (Blocks 94209-95232) + Block bitmap at 94445 (+236), Inode bitmap at 94446 (+237) + Inode table at 94209-94240 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 94241-94444, 94447-95232 + Free inodes: 23553-23808 +Group 93: (Blocks 95233-96256) + Block bitmap at 95482 (+249), Inode bitmap at 95483 (+250) + Inode table at 95233-95264 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 95265-95481, 95484-96256 + Free inodes: 23809-24064 +Group 94: (Blocks 96257-97280) + Block bitmap at 96519 (+262), Inode bitmap at 96520 (+263) + Inode table at 96257-96288 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 96289-96518, 96521-97280 + Free inodes: 24065-24320 +Group 95: (Blocks 97281-98304) + Group descriptor at 97281 + Block bitmap at 97556 (+275), Inode bitmap at 97557 (+276) + Inode table at 97282-97313 (+1) + 989 free blocks, 256 free inodes, 0 directories + Free blocks: 97314-97555, 97558-98304 + Free inodes: 24321-24576 +Group 96: (Blocks 98305-99328) + Group descriptor at 98305 + Block bitmap at 98593 (+288), Inode bitmap at 98594 (+289) + Inode table at 98306-98337 (+1) + 989 free blocks, 256 free inodes, 0 directories + Free blocks: 98338-98592, 98595-99328 + Free inodes: 24577-24832 +Group 97: (Blocks 99329-100352) + Group descriptor at 99329 + Block bitmap at 99630 (+301), Inode bitmap at 99631 (+302) + Inode table at 99330-99361 (+1) + 989 free blocks, 256 free inodes, 0 directories + Free blocks: 99362-99629, 99632-100352 + Free inodes: 24833-25088 +Group 98: (Blocks 100353-101376) + Block bitmap at 100667 (+314), Inode bitmap at 100668 (+315) + Inode table at 100353-100384 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 100385-100666, 100669-101376 + Free inodes: 25089-25344 +Group 99: (Blocks 101377-102400) + Block bitmap at 101704 (+327), Inode bitmap at 101705 (+328) + Inode table at 101377-101408 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 101409-101703, 101706-102400 + Free inodes: 25345-25600 +Group 100: (Blocks 102401-103424) + Block bitmap at 102741 (+340), Inode bitmap at 102742 (+341) + Inode table at 102401-102432 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 102433-102740, 102743-103424 + Free inodes: 25601-25856 +Group 101: (Blocks 103425-104448) + Block bitmap at 103778 (+353), Inode bitmap at 103779 (+354) + Inode table at 103425-103456 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 103457-103777, 103780-104448 + Free inodes: 25857-26112 +Group 102: (Blocks 104449-105472) + Block bitmap at 104815 (+366), Inode bitmap at 104816 (+367) + Inode table at 104449-104480 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 104481-104814, 104817-105472 + Free inodes: 26113-26368 +Group 103: (Blocks 105473-106496) + Block bitmap at 105852 (+379), Inode bitmap at 105853 (+380) + Inode table at 105473-105504 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 105505-105851, 105854-106496 + Free inodes: 26369-26624 +Group 104: (Blocks 106497-107520) + Block bitmap at 106889 (+392), Inode bitmap at 106890 (+393) + Inode table at 106497-106528 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 106529-106888, 106891-107520 + Free inodes: 26625-26880 +Group 105: (Blocks 107521-108544) + Block bitmap at 107926 (+405), Inode bitmap at 107927 (+406) + Inode table at 107521-107552 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 107553-107925, 107928-108544 + Free inodes: 26881-27136 +Group 106: (Blocks 108545-109568) + Block bitmap at 108963 (+418), Inode bitmap at 108964 (+419) + Inode table at 108545-108576 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 108577-108962, 108965-109568 + Free inodes: 27137-27392 +Group 107: (Blocks 109569-110592) + Block bitmap at 110000 (+431), Inode bitmap at 110001 (+432) + Inode table at 109569-109600 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 109601-109999, 110002-110592 + Free inodes: 27393-27648 +Group 108: (Blocks 110593-111616) + Block bitmap at 111037 (+444), Inode bitmap at 111038 (+445) + Inode table at 110593-110624 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 110625-111036, 111039-111616 + Free inodes: 27649-27904 +Group 109: (Blocks 111617-112640) + Block bitmap at 112074 (+457), Inode bitmap at 112075 (+458) + Inode table at 111617-111648 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 111649-112073, 112076-112640 + Free inodes: 27905-28160 +Group 110: (Blocks 112641-113664) + Block bitmap at 113111 (+470), Inode bitmap at 113112 (+471) + Inode table at 112641-112672 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 112673-113110, 113113-113664 + Free inodes: 28161-28416 +Group 111: (Blocks 113665-114688) + Block bitmap at 114148 (+483), Inode bitmap at 114149 (+484) + Inode table at 113665-113696 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 113697-114147, 114150-114688 + Free inodes: 28417-28672 +Group 112: (Blocks 114689-115712) + Block bitmap at 115185 (+496), Inode bitmap at 115186 (+497) + Inode table at 114689-114720 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 114721-115184, 115187-115712 + Free inodes: 28673-28928 +Group 113: (Blocks 115713-116736) + Block bitmap at 116222 (+509), Inode bitmap at 116223 (+510) + Inode table at 115713-115744 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 115745-116221, 116224-116736 + Free inodes: 28929-29184 +Group 114: (Blocks 116737-117760) + Block bitmap at 117259 (+522), Inode bitmap at 117260 (+523) + Inode table at 116737-116768 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 116769-117258, 117261-117760 + Free inodes: 29185-29440 +Group 115: (Blocks 117761-118784) + Block bitmap at 118296 (+535), Inode bitmap at 118297 (+536) + Inode table at 117761-117792 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 117793-118295, 118298-118784 + Free inodes: 29441-29696 +Group 116: (Blocks 118785-119808) + Block bitmap at 119333 (+548), Inode bitmap at 119334 (+549) + Inode table at 118785-118816 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 118817-119332, 119335-119808 + Free inodes: 29697-29952 +Group 117: (Blocks 119809-120832) + Block bitmap at 120370 (+561), Inode bitmap at 120371 (+562) + Inode table at 119809-119840 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 119841-120369, 120372-120832 + Free inodes: 29953-30208 +Group 118: (Blocks 120833-121856) + Block bitmap at 121407 (+574), Inode bitmap at 121408 (+575) + Inode table at 120833-120864 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 120865-121406, 121409-121856 + Free inodes: 30209-30464 +Group 119: (Blocks 121857-122880) + Block bitmap at 122444 (+587), Inode bitmap at 122445 (+588) + Inode table at 121857-121888 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 121889-122443, 122446-122880 + Free inodes: 30465-30720 +Group 120: (Blocks 122881-123904) + Block bitmap at 123481 (+600), Inode bitmap at 123482 (+601) + Inode table at 122881-122912 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 122913-123480, 123483-123904 + Free inodes: 30721-30976 +Group 121: (Blocks 123905-124928) + Block bitmap at 124518 (+613), Inode bitmap at 124519 (+614) + Inode table at 123905-123936 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 123937-124517, 124520-124928 + Free inodes: 30977-31232 +Group 122: (Blocks 124929-125952) + Block bitmap at 125555 (+626), Inode bitmap at 125556 (+627) + Inode table at 124929-124960 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 124961-125554, 125557-125952 + Free inodes: 31233-31488 +Group 123: (Blocks 125953-126976) + Block bitmap at 126592 (+639), Inode bitmap at 126593 (+640) + Inode table at 125953-125984 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 125985-126591, 126594-126976 + Free inodes: 31489-31744 +Group 124: (Blocks 126977-128000) + Block bitmap at 127629 (+652), Inode bitmap at 127630 (+653) + Inode table at 126977-127008 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 127009-127628, 127631-128000 + Free inodes: 31745-32000 +Group 125: (Blocks 128001-129024) + Backup superblock at 128001 + Block bitmap at 128666 (+665), Inode bitmap at 128667 (+666) + Inode table at 128002-128033 (+1) + 989 free blocks, 256 free inodes, 0 directories + Free blocks: 128034-128665, 128668-129024 + Free inodes: 32001-32256 +Group 126: (Blocks 129025-130048) + Block bitmap at 129703 (+678), Inode bitmap at 129704 (+679) + Inode table at 129025-129056 + 990 free blocks, 256 free inodes, 0 directories + Free blocks: 129057-129702, 129705-130048 + Free inodes: 32257-32512 +Group 127: (Blocks 130049-131071) + Group descriptor at 130049 + Block bitmap at 130742 (+693), Inode bitmap at 130743 (+694) + Inode table at 130050-130081 (+1) + 988 free blocks, 256 free inodes, 0 directories + Free blocks: 130082-130741, 130744-131071 + Free inodes: 32513-32768 diff --git a/tests/m_raid_opt/expect.1.gz b/tests/m_raid_opt/expect.1.gz deleted file mode 100644 index dfd419471..000000000 Binary files a/tests/m_raid_opt/expect.1.gz and /dev/null differ diff --git a/tests/m_std/expect.1 b/tests/m_std/expect.1 new file mode 100644 index 000000000..dadbd1855 --- /dev/null +++ b/tests/m_std/expect.1 @@ -0,0 +1,109 @@ +Filesystem label= +OS type: Linux +Block size=1024 (log=0) +Fragment size=1024 (log=0) +16384 inodes, 65536 blocks +3276 blocks (5.00%) reserved for the super user +First data block=1 +8 block groups +8192 blocks per group, 8192 fragments per group +2048 inodes per group +Superblock backups stored on blocks: + 8193, 24577, 40961, 57345 + +Writing inode tables: done +Writing superblocks and filesystem accounting information: done + +Filesystem features: filetype sparse_super + +Pass 1: Checking inodes, blocks, and sizes +Pass 2: Checking directory structure +Pass 3: Checking directory connectivity +Pass 4: Checking reference counts +Pass 5: Checking group summary information +test_filesys: 11/16384 files (0.0% non-contiguous), 2088/65536 blocks +Exit status is 0 + +Filesystem volume name: +Last mounted on: +Filesystem magic number: 0xEF53 +Filesystem revision #: 1 (dynamic) +Filesystem features: filetype sparse_super +Default mount options: (none) +Filesystem state: clean +Errors behavior: Continue +Filesystem OS type: Linux +Inode count: 16384 +Block count: 65536 +Reserved block count: 3276 +Free blocks: 63448 +Free inodes: 16373 +First block: 1 +Block size: 1024 +Fragment size: 1024 +Blocks per group: 8192 +Fragments per group: 8192 +Inodes per group: 2048 +Inode blocks per group: 256 +Mount count: 0 +Check interval: 15552000 (6 months) +Reserved blocks uid: 0 +Reserved blocks gid: 0 +First inode: 11 +Inode size: 128 +Default directory hash: tea + + +Group 0: (Blocks 1-8192) + Primary superblock at 1, Group descriptors at 2-2 + Block bitmap at 3 (+2), Inode bitmap at 4 (+3) + Inode table at 5-260 (+4) + 7919 free blocks, 2037 free inodes, 2 directories + Free blocks: 274-8192 + Free inodes: 12-2048 +Group 1: (Blocks 8193-16384) + Backup superblock at 8193, Group descriptors at 8194-8194 + Block bitmap at 8195 (+2), Inode bitmap at 8196 (+3) + Inode table at 8197-8452 (+4) + 7932 free blocks, 2048 free inodes, 0 directories + Free blocks: 8453-16384 + Free inodes: 2049-4096 +Group 2: (Blocks 16385-24576) + Block bitmap at 16385 (+0), Inode bitmap at 16386 (+1) + Inode table at 16387-16642 (+2) + 7934 free blocks, 2048 free inodes, 0 directories + Free blocks: 16643-24576 + Free inodes: 4097-6144 +Group 3: (Blocks 24577-32768) + Backup superblock at 24577, Group descriptors at 24578-24578 + Block bitmap at 24579 (+2), Inode bitmap at 24580 (+3) + Inode table at 24581-24836 (+4) + 7932 free blocks, 2048 free inodes, 0 directories + Free blocks: 24837-32768 + Free inodes: 6145-8192 +Group 4: (Blocks 32769-40960) + Block bitmap at 32769 (+0), Inode bitmap at 32770 (+1) + Inode table at 32771-33026 (+2) + 7934 free blocks, 2048 free inodes, 0 directories + Free blocks: 33027-40960 + Free inodes: 8193-10240 +Group 5: (Blocks 40961-49152) + Backup superblock at 40961, Group descriptors at 40962-40962 + Block bitmap at 40963 (+2), Inode bitmap at 40964 (+3) + Inode table at 40965-41220 (+4) + 7932 free blocks, 2048 free inodes, 0 directories + Free blocks: 41221-49152 + Free inodes: 10241-12288 +Group 6: (Blocks 49153-57344) + Block bitmap at 49153 (+0), Inode bitmap at 49154 (+1) + Inode table at 49155-49410 (+2) + 7934 free blocks, 2048 free inodes, 0 directories + Free blocks: 49411-57344 + Free inodes: 12289-14336 +Group 7: (Blocks 57345-65535) + Backup superblock at 57345, Group descriptors at 57346-57346 + Block bitmap at 57347 (+2), Inode bitmap at 57348 (+3) + Inode table at 57349-57604 (+4) + 7931 free blocks, 2048 free inodes, 0 directories + Free blocks: 57605-65535 + Free inodes: 14337-16384 diff --git a/tests/m_std/expect.1.gz b/tests/m_std/expect.1.gz deleted file mode 100644 index d39653205..000000000 Binary files a/tests/m_std/expect.1.gz and /dev/null differ diff --git a/tests/r_resize_inode/expect b/tests/r_resize_inode/expect index ad53134d9..319060d1f 100644 --- a/tests/r_resize_inode/expect +++ b/tests/r_resize_inode/expect @@ -1,4 +1,4 @@ -mke2fs -q -F -O resize_inode -b 1024 -g 1024 test.img 16384 +mke2fs -q -F -O resize_inode -o Linux -b 1024 -g 1024 test.img 16384 resize2fs test.img 65536 Resizing the filesystem on ./test.img to 65536 (1k) blocks. The filesystem on ./test.img is now 65536 blocks long. @@ -11,9 +11,9 @@ Pass 5: Checking group summary information test_filesys: 11/16384 files (0.0% non-contiguous), 4513/65536 blocks Exit status is 0 dumpe2fs test.img + Filesystem volume name: Last mounted on: -Filesystem UUID: Filesystem magic number: 0xEF53 Filesystem revision #: 1 (dynamic) Filesystem features: resize_inode filetype sparse_super @@ -35,12 +35,9 @@ Fragments per group: 1024 Inodes per group: 256 Inode blocks per group: 32 Mount count: 0 -Maximum mount count: 20 -Last checked: Thu Jan 1 00:00:00 1970 Check interval: 15552000 (6 months) -Next check after: Tue Jun 30 00:00:00 1970 -Reserved blocks uid: 0 (user root) -Reserved blocks gid: 0 (group root) +Reserved blocks uid: 0 +Reserved blocks gid: 0 First inode: 11 Inode size: 128 Default directory hash: tea @@ -449,7 +446,7 @@ Group 63: (Blocks 64513-65535) Free blocks: 64547-65535 Free inodes: 16129-16384 -------------------------------- -mke2fs -q -F -O resize_inode -b 1024 -g 1024 test.img 65536 +mke2fs -q -F -O resize_inode -o Linux -b 1024 -g 1024 test.img 65536 resize2fs test.img 16384 Resizing the filesystem on ./test.img to 16384 (1k) blocks. The filesystem on ./test.img is now 16384 blocks long. @@ -462,9 +459,9 @@ Pass 5: Checking group summary information test_filesys: 11/4096 files (0.0% non-contiguous), 2107/16384 blocks Exit status is 0 dumpe2fs test.img + Filesystem volume name: Last mounted on: -Filesystem UUID: Filesystem magic number: 0xEF53 Filesystem revision #: 1 (dynamic) Filesystem features: resize_inode filetype sparse_super @@ -486,12 +483,9 @@ Fragments per group: 1024 Inodes per group: 256 Inode blocks per group: 32 Mount count: 0 -Maximum mount count: 20 -Last checked: Thu Jan 1 00:00:00 1970 Check interval: 15552000 (6 months) -Next check after: Tue Jun 30 00:00:00 1970 -Reserved blocks uid: 0 (user root) -Reserved blocks gid: 0 (group root) +Reserved blocks uid: 0 +Reserved blocks gid: 0 First inode: 11 Inode size: 128 Default directory hash: tea @@ -622,9 +616,9 @@ test_filesys: ***** FILE SYSTEM WAS MODIFIED ***** test_filesys: 11/41472 files (0.0% non-contiguous), 8361/165536 blocks Exit status is 1 dumpe2fs test.img + Filesystem volume name: Last mounted on: -Filesystem UUID: Filesystem magic number: 0xEF53 Filesystem revision #: 1 (dynamic) Filesystem features: resize_inode filetype sparse_super @@ -646,12 +640,9 @@ Fragments per group: 1024 Inodes per group: 256 Inode blocks per group: 32 Mount count: 0 -Maximum mount count: 20 -Last checked: Thu Jan 1 00:00:00 1970 Check interval: 15552000 (6 months) -Next check after: Tue Jun 30 00:00:00 1970 -Reserved blocks uid: 0 (user root) -Reserved blocks gid: 0 (group root) +Reserved blocks uid: 0 +Reserved blocks gid: 0 First inode: 11 Inode size: 128 Default directory hash: tea diff --git a/tests/r_resize_inode/script b/tests/r_resize_inode/script index 7a97eed64..339345c8f 100644 --- a/tests/r_resize_inode/script +++ b/tests/r_resize_inode/script @@ -12,8 +12,8 @@ cp /dev/null $OUT dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/null 2>&1 -echo mke2fs -q -F -O resize_inode -b 1024 -g 1024 test.img 16384 > $OUT -$MKE2FS -q -F -O resize_inode -b 1024 -g 1024 $TMPFILE 16384 2>&1 \ +echo mke2fs -q -F -O resize_inode -o Linux -b 1024 -g 1024 test.img 16384 > $OUT +$MKE2FS -q -F -O resize_inode -o Linux -b 1024 -g 1024 $TMPFILE 16384 2>&1 \ | sed -e '1d' | grep -v "automatically checked" | grep -v "whichever comes first" >> $OUT @@ -32,12 +32,12 @@ $DEBUGFS -R "set_super_value mkfs_time 0" -w $TMPFILE >/dev/null 2>&1 $TUNE2FS -c 20 -U clear $TMPFILE >/dev/null 2>&1 echo dumpe2fs test.img >> $OUT -$DUMPE2FS $TMPFILE 2>&1 | sed -e '1d' | grep -v "time: " >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter_dumpe2fs >> $OUT echo "--------------------------------" >> $OUT -echo mke2fs -q -F -O resize_inode -b 1024 -g 1024 test.img 65536 >> $OUT -$MKE2FS -q -F -O resize_inode -b 1024 -g 1024 $TMPFILE 65536 2>&1 \ +echo mke2fs -q -F -O resize_inode -o Linux -b 1024 -g 1024 test.img 65536 >> $OUT +$MKE2FS -q -F -O resize_inode -o Linux -b 1024 -g 1024 $TMPFILE 65536 2>&1 \ | sed -e '1d' | grep -v "automatically checked" | grep -v "whichever comes first" >> $OUT @@ -56,7 +56,7 @@ $DEBUGFS -R "set_super_value mkfs_time 0" -w $TMPFILE >/dev/null 2>&1 $TUNE2FS -c 20 -U clear $TMPFILE >/dev/null 2>&1 echo dumpe2fs test.img >> $OUT -$DUMPE2FS $TMPFILE 2>&1 | sed -e '1d' | grep -v "time: " >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter_dumpe2fs >> $OUT echo "--------------------------------" >> $OUT @@ -75,7 +75,7 @@ $DEBUGFS -R "set_super_value mkfs_time 0" -w $TMPFILE >/dev/null 2>&1 $TUNE2FS -c 20 -U clear $TMPFILE >/dev/null 2>&1 echo dumpe2fs test.img >> $OUT -$DUMPE2FS $TMPFILE 2>&1 | sed -e '1d' | grep -v "time: " >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter_dumpe2fs >> $OUT diff --git a/tests/run_mke2fs b/tests/run_mke2fs index 65d23539e..9d039e3f8 100644 --- a/tests/run_mke2fs +++ b/tests/run_mke2fs @@ -9,7 +9,7 @@ MKE2FS_SKIP_PROGRESS=true MKE2FS_SKIP_CHECK_MSG=true export MKE2FS_SKIP_PROGRESS MKE2FS_SKIP_CHECK_MSG > $TMPFILE -PREP_CMD='$MKE2FS -F $MKE2FS_OPTS $TMPFILE $FS_SIZE 2>&1 | sed -e 1d > $OUT1 ; $DEBUGFS -R features $TMPFILE 2>&1 | sed -e 1d >> $OUT1 ; echo " " >> $OUT1' +PREP_CMD='$MKE2FS -F -o Linux $MKE2FS_OPTS $TMPFILE $FS_SIZE 2>&1 | sed -e 1d > $OUT1 ; $DEBUGFS -R features $TMPFILE 2>&1 | sed -e 1d >> $OUT1 ; echo " " >> $OUT1' AFTER_CMD='$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter_dumpe2fs >> $OUT1' . $cmd_dir/run_e2fsck unset FS_SIZE MKE2FS_OPTS MKE2FS_SKIP_PROGRESS