From 816ed71416f26f65b06afd119ce82ab9956446ce Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Wed, 24 May 2006 13:07:41 -0400 Subject: [PATCH] Update tests to reflect updated mke2fs.conf file Signed-off-by: "Theodore Ts'o" --- tests/ChangeLog | 6 + tests/d_loaddump/expect | 2 +- tests/m_dasd_bs/expect.1 | 28 ++-- tests/m_large_file/expect.1 | 19 ++- tests/m_meta_bg/expect.1 | 58 ++++++- tests/m_no_opt/expect.1 | 118 +------------- tests/m_raid_opt/expect.1 | 124 ++++++++++++-- tests/m_std/expect.1 | 55 ++++--- tests/r_move_itable/expect | 386 +++++++++++++++++++++++--------------------- tests/r_resize_inode/expect | 6 +- 10 files changed, 448 insertions(+), 354 deletions(-) diff --git a/tests/ChangeLog b/tests/ChangeLog index 5e6854d..3b85b00 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,9 @@ +2006-05-24 Theodore Tso + + * d_lodadump, m_dasd_bs, m_large_file, m_meta_bg, m_no_opt, + m_read_opt, m_std, r_move_itable, r_resize_inode: Update + expect files to reflect new mke2fs.conf defaults. + 2006-05-13 Theodore Tso * m_raid_opt: Update expect files to match with new mke2fs layout diff --git a/tests/d_loaddump/expect b/tests/d_loaddump/expect index 5469a83..1fc4561 100644 --- a/tests/d_loaddump/expect +++ b/tests/d_loaddump/expect @@ -10,7 +10,7 @@ Pass 2: Checking directory structure Pass 3: Checking directory connectivity Pass 4: Checking reference counts Pass 5: Checking group summary information -test_filesys: 12/64 files (0.0% non-contiguous), 156/512 blocks +test_filesys: 12/64 files (8.3% non-contiguous), 158/512 blocks Exit status is 0 debugfs -R ''dump test_data test.verify'' ./test.img Exit status is 0 diff --git a/tests/m_dasd_bs/expect.1 b/tests/m_dasd_bs/expect.1 index 9fcf3ea..fd978ba 100644 --- a/tests/m_dasd_bs/expect.1 +++ b/tests/m_dasd_bs/expect.1 @@ -5,6 +5,7 @@ Fragment size=2048 (log=1) 16384 inodes, 32768 blocks 1638 blocks (5.00%) reserved for the super user First data block=0 +Maximum filesystem blocks=33554432 2 block groups 16384 blocks per group, 16384 fragments per group 8192 inodes per group @@ -14,21 +15,21 @@ Superblock backups stored on blocks: Writing inode tables: done Writing superblocks and filesystem accounting information: done -Filesystem features: filetype sparse_super +Filesystem features: resize_inode dir_index 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 +test_filesys: 11/16384 files (9.1% non-contiguous), 1104/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 +Filesystem features: resize_inode dir_index filetype sparse_super Default mount options: (none) Filesystem state: clean Errors behavior: Continue @@ -36,11 +37,12 @@ Filesystem OS type: Linux Inode count: 16384 Block count: 32768 Reserved block count: 1638 -Free blocks: 31727 +Free blocks: 31664 Free inodes: 16373 First block: 0 Block size: 2048 Fragment size: 2048 +Reserved GDT blocks: 31 Blocks per group: 16384 Fragments per group: 16384 Inodes per group: 8192 @@ -56,15 +58,17 @@ 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 + Reserved GDT blocks at 2-32 + Block bitmap at 33 (+33), Inode bitmap at 34 (+34) + Inode table at 35-546 (+35) + 15827 free blocks, 8181 free inodes, 2 directories + Free blocks: 557-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 + Reserved GDT blocks at 16386-16416 + Block bitmap at 16417 (+33), Inode bitmap at 16418 (+34) + Inode table at 16419-16930 (+35) + 15837 free blocks, 8192 free inodes, 0 directories + Free blocks: 16931-32767 Free inodes: 8193-16384 diff --git a/tests/m_large_file/expect.1 b/tests/m_large_file/expect.1 index 515c723..a863e96 100644 --- a/tests/m_large_file/expect.1 +++ b/tests/m_large_file/expect.1 @@ -5,6 +5,7 @@ Fragment size=4096 (log=2) 64 inodes, 16384 blocks 819 blocks (5.00%) reserved for the super user First data block=0 +Maximum filesystem blocks=16777216 1 block group 32768 blocks per group, 32768 fragments per group 64 inodes per group @@ -12,21 +13,21 @@ First data block=0 Writing inode tables: done Writing superblocks and filesystem accounting information: done -Filesystem features: filetype sparse_super +Filesystem features: resize_inode dir_index filetype sparse_super large_file 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 +test_filesys: 11/64 files (9.1% non-contiguous), 15/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 +Filesystem features: resize_inode dir_index filetype sparse_super large_file Default mount options: (none) Filesystem state: clean Errors behavior: Continue @@ -34,11 +35,12 @@ Filesystem OS type: Linux Inode count: 64 Block count: 16384 Reserved block count: 819 -Free blocks: 16373 +Free blocks: 16369 Free inodes: 53 First block: 0 Block size: 4096 Fragment size: 4096 +Reserved GDT blocks: 3 Blocks per group: 32768 Fragments per group: 32768 Inodes per group: 64 @@ -54,8 +56,9 @@ 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 + Reserved GDT blocks at 2-4 + Block bitmap at 5 (+5), Inode bitmap at 6 (+6) + Inode table at 7-8 (+7) + 16369 free blocks, 53 free inodes, 2 directories + Free blocks: 15-16383 Free inodes: 12-64 diff --git a/tests/m_meta_bg/expect.1 b/tests/m_meta_bg/expect.1 index 3414202..2e9c5da 100644 --- a/tests/m_meta_bg/expect.1 +++ b/tests/m_meta_bg/expect.1 @@ -5,6 +5,7 @@ Fragment size=1024 (log=0) 32768 inodes, 131072 blocks 6553 blocks (5.00%) reserved for the super user First data block=1 +Maximum filesystem blocks=8519680 128 block groups 1024 blocks per group, 1024 fragments per group 256 inodes per group @@ -14,21 +15,63 @@ Superblock backups stored on blocks: Writing inode tables: done Writing superblocks and filesystem accounting information: done -Filesystem features: filetype meta_bg sparse_super +Filesystem features: resize_inode dir_index filetype meta_bg sparse_super Pass 1: Checking inodes, blocks, and sizes +Reserved inode 9 () has invalid mode. Clear? yes + +Inode 9, i_blocks is 50182, should be 0. Fix? yes + Pass 2: Checking directory structure +Directory inode 2, block 0, offset 0: directory corrupted +Salvage? yes + +First entry '' (inode=1061) in directory inode 2 (???) should be '.' +Fix? yes + +Setting filetype for entry '.' in ??? (2) to 2. +Missing '..' in directory inode 2. +Fix? yes + +Setting filetype for entry '..' in ??? (2) to 2. Pass 3: Checking directory connectivity +'..' in / (2) is (0), should be / (2). +Fix? yes + +/lost+found not found. Create? yes + Pass 4: Checking reference counts +Inode 2 ref count is 4, should be 3. Fix? yes + Pass 5: Checking group summary information -test_filesys: 11/32768 files (0.0% non-contiguous), 4389/131072 blocks -Exit status is 0 +Block bitmap differences: -(39--49) +Fix? yes + +Free blocks count wrong for group #0 (973, counted=985). +Fix? yes + +Free blocks count wrong (126681, counted=126693). +Fix? yes + +Free inodes count wrong for group #0 (244, counted=245). +Fix? yes + +Directories count wrong for group #0 (3, counted=2). +Fix? yes + +Free inodes count wrong (32756, counted=32757). +Fix? yes + + +test_filesys: ***** FILE SYSTEM WAS MODIFIED ***** +test_filesys: 11/32768 files (0.0% non-contiguous), 4379/131072 blocks +Exit status is 1 Filesystem volume name: Last mounted on: Filesystem magic number: 0xEF53 Filesystem revision #: 1 (dynamic) -Filesystem features: filetype meta_bg sparse_super +Filesystem features: resize_inode dir_index filetype meta_bg sparse_super Default mount options: (none) Filesystem state: clean Errors behavior: Continue @@ -36,11 +79,12 @@ Filesystem OS type: Linux Inode count: 32768 Block count: 131072 Reserved block count: 6553 -Free blocks: 126683 +Free blocks: 126693 Free inodes: 32757 First block: 1 Block size: 1024 Fragment size: 1024 +Reserved GDT blocks: 256 Blocks per group: 1024 Fragments per group: 1024 Inodes per group: 256 @@ -58,8 +102,8 @@ 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 + 985 free blocks, 245 free inodes, 2 directories + Free blocks: 39-294, 296-1024 Free inodes: 12-256 Group 1: (Blocks 1025-2048) Backup superblock at 1025, Group descriptor at 1026 diff --git a/tests/m_no_opt/expect.1 b/tests/m_no_opt/expect.1 index cec95af..f872531 100644 --- a/tests/m_no_opt/expect.1 +++ b/tests/m_no_opt/expect.1 @@ -1,112 +1,10 @@ -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) +mke2fs: reserved online resize blocks not supported on non-sparse filesystem +./test.img: Attempt to read block from filesystem resulted in short read while opening filesystem +features: Filesystem not open -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 - +../e2fsck/e2fsck: Attempt to read block from filesystem resulted in short read while trying to open ./test.img +Could this be a zero-length partition? +Exit status is 8 -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 +../misc/dumpe2fs: Attempt to read block from filesystem resulted in short read while trying to open ./test.img +Couldn't find valid filesystem superblock. diff --git a/tests/m_raid_opt/expect.1 b/tests/m_raid_opt/expect.1 index d6b8337..590879a 100644 --- a/tests/m_raid_opt/expect.1 +++ b/tests/m_raid_opt/expect.1 @@ -5,6 +5,7 @@ Fragment size=1024 (log=0) 32768 inodes, 131072 blocks 6553 blocks (5.00%) reserved for the super user First data block=1 +Maximum filesystem blocks=8519680 128 block groups 1024 blocks per group, 1024 fragments per group 256 inodes per group @@ -14,21 +15,125 @@ Superblock backups stored on blocks: Writing inode tables: done Writing superblocks and filesystem accounting information: done -Filesystem features: filetype meta_bg sparse_super +Filesystem features: resize_inode dir_index filetype meta_bg sparse_super +Resize inode not valid. Recreate? yes + Pass 1: Checking inodes, blocks, and sizes Pass 2: Checking directory structure +Directory inode 2, block 0, offset 0: directory corrupted +Salvage? yes + +First entry '' (inode=1061) in directory inode 2 (???) should be '.' +Fix? yes + +Setting filetype for entry '.' in ??? (2) to 2. +Missing '..' in directory inode 2. +Fix? yes + +Setting filetype for entry '..' in ??? (2) to 2. +Directory inode 11, block 0, offset 0: directory corrupted +Salvage? yes + +First entry '' (inode=1062) in directory inode 11 (???) should be '.' +Fix? yes + +Setting filetype for entry '.' in ??? (11) to 2. +Missing '..' in directory inode 11. +Fix? yes + +Setting filetype for entry '..' in ??? (11) to 2. +Directory inode 11, block 1, offset 0: directory corrupted +Salvage? yes + +Entry '' in ??? (11) has deleted/unused inode 1063. Clear? yes + +Directory inode 11, block 2, offset 0: directory corrupted +Salvage? yes + +Entry '' in ??? (11) has deleted/unused inode 1064. Clear? yes + +Directory inode 11, block 3, offset 0: directory corrupted +Salvage? yes + +Entry '' in ??? (11) has deleted/unused inode 1065. Clear? yes + +Directory inode 11, block 4, offset 0: directory corrupted +Salvage? yes + +Entry '' in ??? (11) has deleted/unused inode 1066. Clear? yes + +Directory inode 11, block 5, offset 0: directory corrupted +Salvage? yes + +Entry '' in ??? (11) has deleted/unused inode 1067. Clear? yes + +Directory inode 11, block 6, offset 0: directory corrupted +Salvage? yes + +Entry '' in ??? (11) has deleted/unused inode 1068. Clear? yes + +Directory inode 11, block 7, offset 0: directory corrupted +Salvage? yes + +Entry '' in ??? (11) has deleted/unused inode 1069. Clear? yes + +Directory inode 11, block 8, offset 0: directory corrupted +Salvage? yes + +Entry '' in ??? (11) has deleted/unused inode 1070. Clear? yes + +Directory inode 11, block 9, offset 0: directory corrupted +Salvage? yes + +Entry '' in ??? (11) has deleted/unused inode 1071. Clear? yes + +Directory inode 11, block 10, offset 0: directory corrupted +Salvage? yes + +Entry '' in ??? (11) has deleted/unused inode 1072. Clear? yes + +Directory inode 11, block 11, offset 0: directory corrupted +Salvage? yes + +Entry '' in ??? (11) has deleted/unused inode 1073. Clear? yes + Pass 3: Checking directory connectivity +'..' in / (2) is (0), should be / (2). +Fix? yes + +Unconnected directory inode 11 (/???) +Connect to /lost+found? yes + +/lost+found not found. Create? yes + +Pass 3A: Optimizing directories Pass 4: Checking reference counts +Inode 11 ref count is 3, should be 2. Fix? yes + Pass 5: Checking group summary information -test_filesys: 11/32768 files (0.0% non-contiguous), 4389/131072 blocks -Exit status is 0 +Block bitmap differences: +(3--5) +(7--10) +(12--32) +(35--37) +39 -(65--66) -70 -75 -77 -(97--98) -102 -(107--109) -(129--130) -134 -139 -142 -(161--162) -166 -171 -(174--175) -(193--194) -198 -(203--204) -(206--207) -(225--226) -230 -235 -(239--240) -(257--258) -262 -267 -271 -273 -(289--290) -294 +295 -299 -(301--305) +Fix? yes + +Free blocks count wrong for group #0 (982, counted=983). +Fix? yes + +Free blocks count wrong (126690, counted=126691). +Fix? yes + +Inode bitmap differences: +(1--2) +(4--5) +(7--10) -35 -38 -(43--44) -67 -70 -75 -77 -99 -102 -(107--109) -131 -134 -139 -142 -163 -166 -171 -(174--175) -195 -198 -(203--204) -(206--207) -227 -230 -235 -(239--240) +Fix? yes + + +test_filesys: ***** FILE SYSTEM WAS MODIFIED ***** +test_filesys: 12/32768 files (0.0% non-contiguous), 4381/131072 blocks +Exit status is 1 Filesystem volume name: Last mounted on: Filesystem magic number: 0xEF53 Filesystem revision #: 1 (dynamic) -Filesystem features: filetype meta_bg sparse_super +Filesystem features: resize_inode dir_index filetype meta_bg sparse_super Default mount options: (none) Filesystem state: clean Errors behavior: Continue @@ -36,11 +141,12 @@ Filesystem OS type: Linux Inode count: 32768 Block count: 131072 Reserved block count: 6553 -Free blocks: 126683 -Free inodes: 32757 +Free blocks: 126691 +Free inodes: 32756 First block: 1 Block size: 1024 Fragment size: 1024 +Reserved GDT blocks: 256 Blocks per group: 1024 Fragments per group: 1024 Inodes per group: 256 @@ -58,9 +164,9 @@ Group 0: (Blocks 1-1024) Primary superblock at 1, Group descriptor at 2 Block bitmap at 35 (+34), Inode bitmap at 36 (+35) Inode table at 3-34 (+2) - 975 free blocks, 245 free inodes, 2 directories - Free blocks: 50-1024 - Free inodes: 12-256 + 983 free blocks, 244 free inodes, 3 directories + Free blocks: 40-49, 51-294, 296-1024 + Free inodes: 13-256 Group 1: (Blocks 1025-2048) Backup superblock at 1025, Group descriptor at 1026 Block bitmap at 1072 (+47), Inode bitmap at 1073 (+48) diff --git a/tests/m_std/expect.1 b/tests/m_std/expect.1 index dadbd18..4159259 100644 --- a/tests/m_std/expect.1 +++ b/tests/m_std/expect.1 @@ -5,6 +5,7 @@ Fragment size=1024 (log=0) 16384 inodes, 65536 blocks 3276 blocks (5.00%) reserved for the super user First data block=1 +Maximum filesystem blocks=67108864 8 block groups 8192 blocks per group, 8192 fragments per group 2048 inodes per group @@ -14,21 +15,21 @@ Superblock backups stored on blocks: Writing inode tables: done Writing superblocks and filesystem accounting information: done -Filesystem features: filetype sparse_super +Filesystem features: resize_inode dir_index 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 +test_filesys: 11/16384 files (9.1% non-contiguous), 3364/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 +Filesystem features: resize_inode dir_index filetype sparse_super Default mount options: (none) Filesystem state: clean Errors behavior: Continue @@ -36,11 +37,12 @@ Filesystem OS type: Linux Inode count: 16384 Block count: 65536 Reserved block count: 3276 -Free blocks: 63448 +Free blocks: 62172 Free inodes: 16373 First block: 1 Block size: 1024 Fragment size: 1024 +Reserved GDT blocks: 255 Blocks per group: 8192 Fragments per group: 8192 Inodes per group: 2048 @@ -56,17 +58,19 @@ 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 + Reserved GDT blocks at 3-257 + Block bitmap at 258 (+257), Inode bitmap at 259 (+258) + Inode table at 260-515 (+259) + 7663 free blocks, 2037 free inodes, 2 directories + Free blocks: 530-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 + Reserved GDT blocks at 8195-8449 + Block bitmap at 8450 (+257), Inode bitmap at 8451 (+258) + Inode table at 8452-8707 (+259) + 7677 free blocks, 2048 free inodes, 0 directories + Free blocks: 8708-16384 Free inodes: 2049-4096 Group 2: (Blocks 16385-24576) Block bitmap at 16385 (+0), Inode bitmap at 16386 (+1) @@ -76,10 +80,11 @@ Group 2: (Blocks 16385-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 + Reserved GDT blocks at 24579-24833 + Block bitmap at 24834 (+257), Inode bitmap at 24835 (+258) + Inode table at 24836-25091 (+259) + 7677 free blocks, 2048 free inodes, 0 directories + Free blocks: 25092-32768 Free inodes: 6145-8192 Group 4: (Blocks 32769-40960) Block bitmap at 32769 (+0), Inode bitmap at 32770 (+1) @@ -89,10 +94,11 @@ Group 4: (Blocks 32769-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 + Reserved GDT blocks at 40963-41217 + Block bitmap at 41218 (+257), Inode bitmap at 41219 (+258) + Inode table at 41220-41475 (+259) + 7677 free blocks, 2048 free inodes, 0 directories + Free blocks: 41476-49152 Free inodes: 10241-12288 Group 6: (Blocks 49153-57344) Block bitmap at 49153 (+0), Inode bitmap at 49154 (+1) @@ -102,8 +108,9 @@ Group 6: (Blocks 49153-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 + Reserved GDT blocks at 57347-57601 + Block bitmap at 57602 (+257), Inode bitmap at 57603 (+258) + Inode table at 57604-57859 (+259) + 7676 free blocks, 2048 free inodes, 0 directories + Free blocks: 57860-65535 Free inodes: 14337-16384 diff --git a/tests/r_move_itable/expect b/tests/r_move_itable/expect index 133a700..a28f2a4 100644 --- a/tests/r_move_itable/expect +++ b/tests/r_move_itable/expect @@ -3,10 +3,6 @@ resize2fs -p test.img 10000 Resizing the filesystem on ./test.img to 10000 (1k) blocks. Begin pass 1 (max = 35) Extending the inode table ----------------------------------------XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -Begin pass 2 (max = 1) -Relocating blocks ----------------------------------------XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -Begin pass 3 (max = 4) -Scanning inode table ----------------------------------------XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX The filesystem on ./test.img is now 9985 blocks long. Pass 1: Checking inodes, blocks, and sizes @@ -14,7 +10,7 @@ Pass 2: Checking directory structure Pass 3: Checking directory connectivity Pass 4: Checking reference counts Pass 5: Checking group summary information -test_filesys: 11/1248 files (0.0% non-contiguous), 272/9985 blocks +test_filesys: 11/1248 files (0.0% non-contiguous), 1281/9985 blocks Exit status is 0 dumpe2fs test.img @@ -22,7 +18,7 @@ Filesystem volume name: Last mounted on: Filesystem magic number: 0xEF53 Filesystem revision #: 1 (dynamic) -Filesystem features: filetype sparse_super +Filesystem features: resize_inode dir_index filetype sparse_super Default mount options: (none) Filesystem state: clean Errors behavior: Continue @@ -30,11 +26,12 @@ Filesystem OS type: Linux Inode count: 1248 Block count: 9985 Reserved block count: 399 -Free blocks: 9713 +Free blocks: 8704 Free inodes: 1237 First block: 1 Block size: 1024 Fragment size: 1024 +Reserved GDT blocks: 126 Blocks per group: 256 Fragments per group: 256 Inodes per group: 32 @@ -50,17 +47,19 @@ Default directory hash: tea Group 0: (Blocks 1-256) Primary superblock at 1, Group descriptors at 2-3 - Block bitmap at 9 (+8), Inode bitmap at 4 (+3) - Inode table at 5-8 (+4) - 234 free blocks, 21 free inodes, 2 directories - Free blocks: 23-256 + Reserved GDT blocks at 4-129 + Block bitmap at 130 (+129), Inode bitmap at 131 (+130) + Inode table at 132-135 (+131) + 107 free blocks, 21 free inodes, 2 directories + Free blocks: 150-256 Free inodes: 12-32 Group 1: (Blocks 257-512) Backup superblock at 257, Group descriptors at 258-259 - Block bitmap at 265 (+8), Inode bitmap at 260 (+3) - Inode table at 261-264 (+4) - 247 free blocks, 32 free inodes, 0 directories - Free blocks: 266-512 + Reserved GDT blocks at 260-385 + Block bitmap at 386 (+129), Inode bitmap at 387 (+130) + Inode table at 388-391 (+131) + 121 free blocks, 32 free inodes, 0 directories + Free blocks: 392-512 Free inodes: 33-64 Group 2: (Blocks 513-768) Block bitmap at 513 (+0), Inode bitmap at 514 (+1) @@ -70,10 +69,11 @@ Group 2: (Blocks 513-768) Free inodes: 65-96 Group 3: (Blocks 769-1024) Backup superblock at 769, Group descriptors at 770-771 - Block bitmap at 777 (+8), Inode bitmap at 772 (+3) - Inode table at 773-776 (+4) - 247 free blocks, 32 free inodes, 0 directories - Free blocks: 778-1024 + Reserved GDT blocks at 772-897 + Block bitmap at 898 (+129), Inode bitmap at 899 (+130) + Inode table at 900-903 (+131) + 121 free blocks, 32 free inodes, 0 directories + Free blocks: 904-1024 Free inodes: 97-128 Group 4: (Blocks 1025-1280) Block bitmap at 1025 (+0), Inode bitmap at 1026 (+1) @@ -83,10 +83,11 @@ Group 4: (Blocks 1025-1280) Free inodes: 129-160 Group 5: (Blocks 1281-1536) Backup superblock at 1281, Group descriptors at 1282-1283 - Block bitmap at 1284 (+3), Inode bitmap at 1285 (+4) - Inode table at 1286-1289 (+5) - 247 free blocks, 32 free inodes, 0 directories - Free blocks: 1290-1536 + Reserved GDT blocks at 1284-1409 + Block bitmap at 1410 (+129), Inode bitmap at 1411 (+130) + Inode table at 1412-1415 (+131) + 121 free blocks, 32 free inodes, 0 directories + Free blocks: 1416-1536 Free inodes: 161-192 Group 6: (Blocks 1537-1792) Block bitmap at 1537 (+0), Inode bitmap at 1538 (+1) @@ -96,10 +97,11 @@ Group 6: (Blocks 1537-1792) Free inodes: 193-224 Group 7: (Blocks 1793-2048) Backup superblock at 1793, Group descriptors at 1794-1795 - Block bitmap at 1796 (+3), Inode bitmap at 1797 (+4) - Inode table at 1798-1801 (+5) - 247 free blocks, 32 free inodes, 0 directories - Free blocks: 1802-2048 + Reserved GDT blocks at 1796-1921 + Block bitmap at 1922 (+129), Inode bitmap at 1923 (+130) + Inode table at 1924-1927 (+131) + 121 free blocks, 32 free inodes, 0 directories + Free blocks: 1928-2048 Free inodes: 225-256 Group 8: (Blocks 2049-2304) Block bitmap at 2049 (+0), Inode bitmap at 2050 (+1) @@ -109,10 +111,11 @@ Group 8: (Blocks 2049-2304) Free inodes: 257-288 Group 9: (Blocks 2305-2560) Backup superblock at 2305, Group descriptors at 2306-2307 - Block bitmap at 2308 (+3), Inode bitmap at 2309 (+4) - Inode table at 2310-2313 (+5) - 247 free blocks, 32 free inodes, 0 directories - Free blocks: 2314-2560 + Reserved GDT blocks at 2308-2433 + Block bitmap at 2434 (+129), Inode bitmap at 2435 (+130) + Inode table at 2436-2439 (+131) + 121 free blocks, 32 free inodes, 0 directories + Free blocks: 2440-2560 Free inodes: 289-320 Group 10: (Blocks 2561-2816) Block bitmap at 2561 (+0), Inode bitmap at 2562 (+1) @@ -206,10 +209,11 @@ Group 24: (Blocks 6145-6400) Free inodes: 769-800 Group 25: (Blocks 6401-6656) Backup superblock at 6401, Group descriptors at 6402-6403 - Block bitmap at 6404 (+3), Inode bitmap at 6405 (+4) - Inode table at 6406-6409 (+5) - 247 free blocks, 32 free inodes, 0 directories - Free blocks: 6410-6656 + Reserved GDT blocks at 6404-6529 + Block bitmap at 6530 (+129), Inode bitmap at 6531 (+130) + Inode table at 6532-6535 (+131) + 121 free blocks, 32 free inodes, 0 directories + Free blocks: 6536-6656 Free inodes: 801-832 Group 26: (Blocks 6657-6912) Block bitmap at 6657 (+0), Inode bitmap at 6658 (+1) @@ -219,10 +223,11 @@ Group 26: (Blocks 6657-6912) Free inodes: 833-864 Group 27: (Blocks 6913-7168) Backup superblock at 6913, Group descriptors at 6914-6915 - Block bitmap at 6916 (+3), Inode bitmap at 6917 (+4) - Inode table at 6918-6921 (+5) - 247 free blocks, 32 free inodes, 0 directories - Free blocks: 6922-7168 + Reserved GDT blocks at 6916-7041 + Block bitmap at 7042 (+129), Inode bitmap at 7043 (+130) + Inode table at 7044-7047 (+131) + 121 free blocks, 32 free inodes, 0 directories + Free blocks: 7048-7168 Free inodes: 865-896 Group 28: (Blocks 7169-7424) Block bitmap at 7169 (+0), Inode bitmap at 7170 (+1) @@ -295,10 +300,6 @@ resize2fs -p test.img 20000 Resizing the filesystem on ./test.img to 20000 (1k) blocks. Begin pass 1 (max = 39) Extending the inode table ----------------------------------------XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -Begin pass 2 (max = 1) -Relocating blocks ----------------------------------------XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -Begin pass 3 (max = 39) -Scanning inode table ----------------------------------------XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX The filesystem on ./test.img is now 19969 blocks long. Filesystem did not have a UUID; generating one. @@ -310,7 +311,7 @@ Pass 4: Checking reference counts Pass 5: Checking group summary information test_filesys: ***** FILE SYSTEM WAS MODIFIED ***** -test_filesys: 11/2496 files (9.1% non-contiguous), 518/19969 blocks +test_filesys: 11/2496 files (0.0% non-contiguous), 1644/19969 blocks Exit status is 1 dumpe2fs test.img @@ -318,7 +319,7 @@ Filesystem volume name: Last mounted on: Filesystem magic number: 0xEF53 Filesystem revision #: 1 (dynamic) -Filesystem features: filetype sparse_super +Filesystem features: resize_inode dir_index filetype sparse_super Default mount options: (none) Filesystem state: clean Errors behavior: Continue @@ -326,11 +327,12 @@ Filesystem OS type: Linux Inode count: 2496 Block count: 19969 Reserved block count: 599 -Free blocks: 19451 +Free blocks: 18325 Free inodes: 2485 First block: 1 Block size: 1024 Fragment size: 1024 +Reserved GDT blocks: 125 Blocks per group: 256 Fragments per group: 256 Inodes per group: 32 @@ -346,17 +348,19 @@ Default directory hash: tea Group 0: (Blocks 1-256) Primary superblock at 1, Group descriptors at 2-4 - Block bitmap at 9 (+8), Inode bitmap at 10 (+9) - Inode table at 5-8 (+4) - 233 free blocks, 21 free inodes, 2 directories - Free blocks: 24-256 + Reserved GDT blocks at 5-129 + Block bitmap at 130 (+129), Inode bitmap at 131 (+130) + Inode table at 132-135 (+131) + 107 free blocks, 21 free inodes, 2 directories + Free blocks: 150-256 Free inodes: 12-32 Group 1: (Blocks 257-512) Backup superblock at 257, Group descriptors at 258-260 - Block bitmap at 265 (+8), Inode bitmap at 266 (+9) - Inode table at 261-264 (+4) - 246 free blocks, 32 free inodes, 0 directories - Free blocks: 267-512 + Reserved GDT blocks at 261-385 + Block bitmap at 386 (+129), Inode bitmap at 387 (+130) + Inode table at 388-391 (+131) + 121 free blocks, 32 free inodes, 0 directories + Free blocks: 392-512 Free inodes: 33-64 Group 2: (Blocks 513-768) Block bitmap at 513 (+0), Inode bitmap at 514 (+1) @@ -366,10 +370,11 @@ Group 2: (Blocks 513-768) Free inodes: 65-96 Group 3: (Blocks 769-1024) Backup superblock at 769, Group descriptors at 770-772 - Block bitmap at 777 (+8), Inode bitmap at 778 (+9) - Inode table at 773-776 (+4) - 246 free blocks, 32 free inodes, 0 directories - Free blocks: 779-1024 + Reserved GDT blocks at 773-897 + Block bitmap at 898 (+129), Inode bitmap at 899 (+130) + Inode table at 900-903 (+131) + 121 free blocks, 32 free inodes, 0 directories + Free blocks: 904-1024 Free inodes: 97-128 Group 4: (Blocks 1025-1280) Block bitmap at 1025 (+0), Inode bitmap at 1026 (+1) @@ -379,10 +384,11 @@ Group 4: (Blocks 1025-1280) Free inodes: 129-160 Group 5: (Blocks 1281-1536) Backup superblock at 1281, Group descriptors at 1282-1284 - Block bitmap at 1290 (+9), Inode bitmap at 1285 (+4) - Inode table at 1286-1289 (+5) - 246 free blocks, 32 free inodes, 0 directories - Free blocks: 1291-1536 + Reserved GDT blocks at 1285-1409 + Block bitmap at 1410 (+129), Inode bitmap at 1411 (+130) + Inode table at 1412-1415 (+131) + 121 free blocks, 32 free inodes, 0 directories + Free blocks: 1416-1536 Free inodes: 161-192 Group 6: (Blocks 1537-1792) Block bitmap at 1537 (+0), Inode bitmap at 1538 (+1) @@ -392,10 +398,11 @@ Group 6: (Blocks 1537-1792) Free inodes: 193-224 Group 7: (Blocks 1793-2048) Backup superblock at 1793, Group descriptors at 1794-1796 - Block bitmap at 1802 (+9), Inode bitmap at 1797 (+4) - Inode table at 1798-1801 (+5) - 246 free blocks, 32 free inodes, 0 directories - Free blocks: 1803-2048 + Reserved GDT blocks at 1797-1921 + Block bitmap at 1922 (+129), Inode bitmap at 1923 (+130) + Inode table at 1924-1927 (+131) + 121 free blocks, 32 free inodes, 0 directories + Free blocks: 1928-2048 Free inodes: 225-256 Group 8: (Blocks 2049-2304) Block bitmap at 2049 (+0), Inode bitmap at 2050 (+1) @@ -405,10 +412,11 @@ Group 8: (Blocks 2049-2304) Free inodes: 257-288 Group 9: (Blocks 2305-2560) Backup superblock at 2305, Group descriptors at 2306-2308 - Block bitmap at 2314 (+9), Inode bitmap at 2309 (+4) - Inode table at 2310-2313 (+5) - 246 free blocks, 32 free inodes, 0 directories - Free blocks: 2315-2560 + Reserved GDT blocks at 2309-2433 + Block bitmap at 2434 (+129), Inode bitmap at 2435 (+130) + Inode table at 2436-2439 (+131) + 121 free blocks, 32 free inodes, 0 directories + Free blocks: 2440-2560 Free inodes: 289-320 Group 10: (Blocks 2561-2816) Block bitmap at 2561 (+0), Inode bitmap at 2562 (+1) @@ -502,10 +510,11 @@ Group 24: (Blocks 6145-6400) Free inodes: 769-800 Group 25: (Blocks 6401-6656) Backup superblock at 6401, Group descriptors at 6402-6404 - Block bitmap at 6410 (+9), Inode bitmap at 6405 (+4) - Inode table at 6406-6409 (+5) - 246 free blocks, 32 free inodes, 0 directories - Free blocks: 6411-6656 + Reserved GDT blocks at 6405-6529 + Block bitmap at 6530 (+129), Inode bitmap at 6531 (+130) + Inode table at 6532-6535 (+131) + 121 free blocks, 32 free inodes, 0 directories + Free blocks: 6536-6656 Free inodes: 801-832 Group 26: (Blocks 6657-6912) Block bitmap at 6657 (+0), Inode bitmap at 6658 (+1) @@ -515,10 +524,11 @@ Group 26: (Blocks 6657-6912) Free inodes: 833-864 Group 27: (Blocks 6913-7168) Backup superblock at 6913, Group descriptors at 6914-6916 - Block bitmap at 6922 (+9), Inode bitmap at 6917 (+4) - Inode table at 6918-6921 (+5) - 246 free blocks, 32 free inodes, 0 directories - Free blocks: 6923-7168 + Reserved GDT blocks at 6917-7041 + Block bitmap at 7042 (+129), Inode bitmap at 7043 (+130) + Inode table at 7044-7047 (+131) + 121 free blocks, 32 free inodes, 0 directories + Free blocks: 7048-7168 Free inodes: 865-896 Group 28: (Blocks 7169-7424) Block bitmap at 7169 (+0), Inode bitmap at 7170 (+1) @@ -648,10 +658,11 @@ Group 48: (Blocks 12289-12544) Free inodes: 1537-1568 Group 49: (Blocks 12545-12800) Backup superblock at 12545, Group descriptors at 12546-12548 - Block bitmap at 12549 (+4), Inode bitmap at 12550 (+5) - Inode table at 12551-12554 (+6) - 246 free blocks, 32 free inodes, 0 directories - Free blocks: 12555-12800 + Reserved GDT blocks at 12549-12673 + Block bitmap at 12674 (+129), Inode bitmap at 12675 (+130) + Inode table at 12676-12679 (+131) + 121 free blocks, 32 free inodes, 0 directories + Free blocks: 12680-12800 Free inodes: 1569-1600 Group 50: (Blocks 12801-13056) Block bitmap at 12801 (+0), Inode bitmap at 12802 (+1) @@ -826,12 +837,6 @@ resize2fs -p test.img 30000 Resizing the filesystem on ./test.img to 30000 (1k) blocks. Begin pass 1 (max = 39) Extending the inode table ----------------------------------------XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -Begin pass 2 (max = 4) -Relocating blocks ----------------------------------------XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -Begin pass 3 (max = 78) -Scanning inode table ----------------------------------------XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -Begin pass 5 (max = 3) -Moving inode table ----------------------------------------XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX The filesystem on ./test.img is now 29953 blocks long. Filesystem did not have a UUID; generating one. @@ -843,7 +848,7 @@ Pass 4: Checking reference counts Pass 5: Checking group summary information test_filesys: ***** FILE SYSTEM WAS MODIFIED ***** -test_filesys: 11/3744 files (9.1% non-contiguous), 766/29953 blocks +test_filesys: 11/3744 files (0.0% non-contiguous), 2007/29953 blocks Exit status is 1 dumpe2fs test.img @@ -851,7 +856,7 @@ Filesystem volume name: Last mounted on: Filesystem magic number: 0xEF53 Filesystem revision #: 1 (dynamic) -Filesystem features: filetype sparse_super +Filesystem features: resize_inode dir_index filetype sparse_super Default mount options: (none) Filesystem state: clean Errors behavior: Continue @@ -859,11 +864,12 @@ Filesystem OS type: Linux Inode count: 3744 Block count: 29953 Reserved block count: 599 -Free blocks: 29187 +Free blocks: 27946 Free inodes: 3733 First block: 1 Block size: 1024 Fragment size: 1024 +Reserved GDT blocks: 124 Blocks per group: 256 Fragments per group: 256 Inodes per group: 32 @@ -879,17 +885,19 @@ Default directory hash: tea Group 0: (Blocks 1-256) Primary superblock at 1, Group descriptors at 2-5 - Block bitmap at 9 (+8), Inode bitmap at 10 (+9) - Inode table at 11-14 (+10) - 232 free blocks, 21 free inodes, 2 directories - Free blocks: 6-8, 28-256 + Reserved GDT blocks at 6-129 + Block bitmap at 130 (+129), Inode bitmap at 131 (+130) + Inode table at 132-135 (+131) + 107 free blocks, 21 free inodes, 2 directories + Free blocks: 150-256 Free inodes: 12-32 Group 1: (Blocks 257-512) Backup superblock at 257, Group descriptors at 258-261 - Block bitmap at 265 (+8), Inode bitmap at 266 (+9) - Inode table at 267-270 (+10) - 245 free blocks, 32 free inodes, 0 directories - Free blocks: 262-264, 271-512 + Reserved GDT blocks at 262-385 + Block bitmap at 386 (+129), Inode bitmap at 387 (+130) + Inode table at 388-391 (+131) + 121 free blocks, 32 free inodes, 0 directories + Free blocks: 392-512 Free inodes: 33-64 Group 2: (Blocks 513-768) Block bitmap at 513 (+0), Inode bitmap at 514 (+1) @@ -899,10 +907,11 @@ Group 2: (Blocks 513-768) Free inodes: 65-96 Group 3: (Blocks 769-1024) Backup superblock at 769, Group descriptors at 770-773 - Block bitmap at 777 (+8), Inode bitmap at 778 (+9) - Inode table at 779-782 (+10) - 245 free blocks, 32 free inodes, 0 directories - Free blocks: 774-776, 783-1024 + Reserved GDT blocks at 774-897 + Block bitmap at 898 (+129), Inode bitmap at 899 (+130) + Inode table at 900-903 (+131) + 121 free blocks, 32 free inodes, 0 directories + Free blocks: 904-1024 Free inodes: 97-128 Group 4: (Blocks 1025-1280) Block bitmap at 1025 (+0), Inode bitmap at 1026 (+1) @@ -912,10 +921,11 @@ Group 4: (Blocks 1025-1280) Free inodes: 129-160 Group 5: (Blocks 1281-1536) Backup superblock at 1281, Group descriptors at 1282-1285 - Block bitmap at 1290 (+9), Inode bitmap at 1291 (+10) - Inode table at 1286-1289 (+5) - 245 free blocks, 32 free inodes, 0 directories - Free blocks: 1292-1536 + Reserved GDT blocks at 1286-1409 + Block bitmap at 1410 (+129), Inode bitmap at 1411 (+130) + Inode table at 1412-1415 (+131) + 121 free blocks, 32 free inodes, 0 directories + Free blocks: 1416-1536 Free inodes: 161-192 Group 6: (Blocks 1537-1792) Block bitmap at 1537 (+0), Inode bitmap at 1538 (+1) @@ -925,10 +935,11 @@ Group 6: (Blocks 1537-1792) Free inodes: 193-224 Group 7: (Blocks 1793-2048) Backup superblock at 1793, Group descriptors at 1794-1797 - Block bitmap at 1802 (+9), Inode bitmap at 1803 (+10) - Inode table at 1798-1801 (+5) - 245 free blocks, 32 free inodes, 0 directories - Free blocks: 1804-2048 + Reserved GDT blocks at 1798-1921 + Block bitmap at 1922 (+129), Inode bitmap at 1923 (+130) + Inode table at 1924-1927 (+131) + 121 free blocks, 32 free inodes, 0 directories + Free blocks: 1928-2048 Free inodes: 225-256 Group 8: (Blocks 2049-2304) Block bitmap at 2049 (+0), Inode bitmap at 2050 (+1) @@ -938,10 +949,11 @@ Group 8: (Blocks 2049-2304) Free inodes: 257-288 Group 9: (Blocks 2305-2560) Backup superblock at 2305, Group descriptors at 2306-2309 - Block bitmap at 2314 (+9), Inode bitmap at 2315 (+10) - Inode table at 2310-2313 (+5) - 245 free blocks, 32 free inodes, 0 directories - Free blocks: 2316-2560 + Reserved GDT blocks at 2310-2433 + Block bitmap at 2434 (+129), Inode bitmap at 2435 (+130) + Inode table at 2436-2439 (+131) + 121 free blocks, 32 free inodes, 0 directories + Free blocks: 2440-2560 Free inodes: 289-320 Group 10: (Blocks 2561-2816) Block bitmap at 2561 (+0), Inode bitmap at 2562 (+1) @@ -1035,10 +1047,11 @@ Group 24: (Blocks 6145-6400) Free inodes: 769-800 Group 25: (Blocks 6401-6656) Backup superblock at 6401, Group descriptors at 6402-6405 - Block bitmap at 6410 (+9), Inode bitmap at 6411 (+10) - Inode table at 6406-6409 (+5) - 245 free blocks, 32 free inodes, 0 directories - Free blocks: 6412-6656 + Reserved GDT blocks at 6406-6529 + Block bitmap at 6530 (+129), Inode bitmap at 6531 (+130) + Inode table at 6532-6535 (+131) + 121 free blocks, 32 free inodes, 0 directories + Free blocks: 6536-6656 Free inodes: 801-832 Group 26: (Blocks 6657-6912) Block bitmap at 6657 (+0), Inode bitmap at 6658 (+1) @@ -1048,10 +1061,11 @@ Group 26: (Blocks 6657-6912) Free inodes: 833-864 Group 27: (Blocks 6913-7168) Backup superblock at 6913, Group descriptors at 6914-6917 - Block bitmap at 6922 (+9), Inode bitmap at 6923 (+10) - Inode table at 6918-6921 (+5) - 245 free blocks, 32 free inodes, 0 directories - Free blocks: 6924-7168 + Reserved GDT blocks at 6918-7041 + Block bitmap at 7042 (+129), Inode bitmap at 7043 (+130) + Inode table at 7044-7047 (+131) + 121 free blocks, 32 free inodes, 0 directories + Free blocks: 7048-7168 Free inodes: 865-896 Group 28: (Blocks 7169-7424) Block bitmap at 7169 (+0), Inode bitmap at 7170 (+1) @@ -1181,10 +1195,11 @@ Group 48: (Blocks 12289-12544) Free inodes: 1537-1568 Group 49: (Blocks 12545-12800) Backup superblock at 12545, Group descriptors at 12546-12549 - Block bitmap at 12555 (+10), Inode bitmap at 12550 (+5) - Inode table at 12551-12554 (+6) - 245 free blocks, 32 free inodes, 0 directories - Free blocks: 12556-12800 + Reserved GDT blocks at 12550-12673 + Block bitmap at 12674 (+129), Inode bitmap at 12675 (+130) + Inode table at 12676-12679 (+131) + 121 free blocks, 32 free inodes, 0 directories + Free blocks: 12680-12800 Free inodes: 1569-1600 Group 50: (Blocks 12801-13056) Block bitmap at 12801 (+0), Inode bitmap at 12802 (+1) @@ -1374,10 +1389,11 @@ Group 80: (Blocks 20481-20736) Free inodes: 2561-2592 Group 81: (Blocks 20737-20992) Backup superblock at 20737, Group descriptors at 20738-20741 - Block bitmap at 20742 (+5), Inode bitmap at 20743 (+6) - Inode table at 20744-20747 (+7) - 245 free blocks, 32 free inodes, 0 directories - Free blocks: 20748-20992 + Reserved GDT blocks at 20742-20865 + Block bitmap at 20866 (+129), Inode bitmap at 20867 (+130) + Inode table at 20868-20871 (+131) + 121 free blocks, 32 free inodes, 0 directories + Free blocks: 20872-20992 Free inodes: 2593-2624 Group 82: (Blocks 20993-21248) Block bitmap at 20993 (+0), Inode bitmap at 20994 (+1) @@ -1594,8 +1610,6 @@ resize2fs -p test.img 40000 Resizing the filesystem on ./test.img to 40000 (1k) blocks. Begin pass 1 (max = 40) Extending the inode table ----------------------------------------XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -Begin pass 5 (max = 5) -Moving inode table ----------------------------------------XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX The filesystem on ./test.img is now 40000 blocks long. Filesystem did not have a UUID; generating one. @@ -1607,7 +1621,7 @@ Pass 4: Checking reference counts Pass 5: Checking group summary information test_filesys: ***** FILE SYSTEM WAS MODIFIED ***** -test_filesys: 11/5024 files (9.1% non-contiguous), 1022/40000 blocks +test_filesys: 11/5024 files (0.0% non-contiguous), 2376/40000 blocks Exit status is 1 dumpe2fs test.img @@ -1615,7 +1629,7 @@ Filesystem volume name: Last mounted on: Filesystem magic number: 0xEF53 Filesystem revision #: 1 (dynamic) -Filesystem features: filetype sparse_super +Filesystem features: resize_inode dir_index filetype sparse_super Default mount options: (none) Filesystem state: clean Errors behavior: Continue @@ -1623,11 +1637,12 @@ Filesystem OS type: Linux Inode count: 5024 Block count: 40000 Reserved block count: 400 -Free blocks: 38978 +Free blocks: 37624 Free inodes: 5013 First block: 1 Block size: 1024 Fragment size: 1024 +Reserved GDT blocks: 123 Blocks per group: 256 Fragments per group: 256 Inodes per group: 32 @@ -1643,17 +1658,19 @@ Default directory hash: tea Group 0: (Blocks 1-256) Primary superblock at 1, Group descriptors at 2-6 - Block bitmap at 9 (+8), Inode bitmap at 10 (+9) - Inode table at 11-14 (+10) - 231 free blocks, 21 free inodes, 2 directories - Free blocks: 7-8, 28-256 + Reserved GDT blocks at 7-129 + Block bitmap at 130 (+129), Inode bitmap at 131 (+130) + Inode table at 132-135 (+131) + 107 free blocks, 21 free inodes, 2 directories + Free blocks: 150-256 Free inodes: 12-32 Group 1: (Blocks 257-512) Backup superblock at 257, Group descriptors at 258-262 - Block bitmap at 265 (+8), Inode bitmap at 266 (+9) - Inode table at 267-270 (+10) - 244 free blocks, 32 free inodes, 0 directories - Free blocks: 263-264, 271-512 + Reserved GDT blocks at 263-385 + Block bitmap at 386 (+129), Inode bitmap at 387 (+130) + Inode table at 388-391 (+131) + 121 free blocks, 32 free inodes, 0 directories + Free blocks: 392-512 Free inodes: 33-64 Group 2: (Blocks 513-768) Block bitmap at 513 (+0), Inode bitmap at 514 (+1) @@ -1663,10 +1680,11 @@ Group 2: (Blocks 513-768) Free inodes: 65-96 Group 3: (Blocks 769-1024) Backup superblock at 769, Group descriptors at 770-774 - Block bitmap at 777 (+8), Inode bitmap at 778 (+9) - Inode table at 779-782 (+10) - 244 free blocks, 32 free inodes, 0 directories - Free blocks: 775-776, 783-1024 + Reserved GDT blocks at 775-897 + Block bitmap at 898 (+129), Inode bitmap at 899 (+130) + Inode table at 900-903 (+131) + 121 free blocks, 32 free inodes, 0 directories + Free blocks: 904-1024 Free inodes: 97-128 Group 4: (Blocks 1025-1280) Block bitmap at 1025 (+0), Inode bitmap at 1026 (+1) @@ -1676,10 +1694,11 @@ Group 4: (Blocks 1025-1280) Free inodes: 129-160 Group 5: (Blocks 1281-1536) Backup superblock at 1281, Group descriptors at 1282-1286 - Block bitmap at 1290 (+9), Inode bitmap at 1291 (+10) - Inode table at 1292-1295 (+11) - 244 free blocks, 32 free inodes, 0 directories - Free blocks: 1287-1289, 1296-1536 + Reserved GDT blocks at 1287-1409 + Block bitmap at 1410 (+129), Inode bitmap at 1411 (+130) + Inode table at 1412-1415 (+131) + 121 free blocks, 32 free inodes, 0 directories + Free blocks: 1416-1536 Free inodes: 161-192 Group 6: (Blocks 1537-1792) Block bitmap at 1537 (+0), Inode bitmap at 1538 (+1) @@ -1689,10 +1708,11 @@ Group 6: (Blocks 1537-1792) Free inodes: 193-224 Group 7: (Blocks 1793-2048) Backup superblock at 1793, Group descriptors at 1794-1798 - Block bitmap at 1802 (+9), Inode bitmap at 1803 (+10) - Inode table at 1804-1807 (+11) - 244 free blocks, 32 free inodes, 0 directories - Free blocks: 1799-1801, 1808-2048 + Reserved GDT blocks at 1799-1921 + Block bitmap at 1922 (+129), Inode bitmap at 1923 (+130) + Inode table at 1924-1927 (+131) + 121 free blocks, 32 free inodes, 0 directories + Free blocks: 1928-2048 Free inodes: 225-256 Group 8: (Blocks 2049-2304) Block bitmap at 2049 (+0), Inode bitmap at 2050 (+1) @@ -1702,10 +1722,11 @@ Group 8: (Blocks 2049-2304) Free inodes: 257-288 Group 9: (Blocks 2305-2560) Backup superblock at 2305, Group descriptors at 2306-2310 - Block bitmap at 2314 (+9), Inode bitmap at 2315 (+10) - Inode table at 2316-2319 (+11) - 244 free blocks, 32 free inodes, 0 directories - Free blocks: 2311-2313, 2320-2560 + Reserved GDT blocks at 2311-2433 + Block bitmap at 2434 (+129), Inode bitmap at 2435 (+130) + Inode table at 2436-2439 (+131) + 121 free blocks, 32 free inodes, 0 directories + Free blocks: 2440-2560 Free inodes: 289-320 Group 10: (Blocks 2561-2816) Block bitmap at 2561 (+0), Inode bitmap at 2562 (+1) @@ -1799,10 +1820,11 @@ Group 24: (Blocks 6145-6400) Free inodes: 769-800 Group 25: (Blocks 6401-6656) Backup superblock at 6401, Group descriptors at 6402-6406 - Block bitmap at 6410 (+9), Inode bitmap at 6411 (+10) - Inode table at 6412-6415 (+11) - 244 free blocks, 32 free inodes, 0 directories - Free blocks: 6407-6409, 6416-6656 + Reserved GDT blocks at 6407-6529 + Block bitmap at 6530 (+129), Inode bitmap at 6531 (+130) + Inode table at 6532-6535 (+131) + 121 free blocks, 32 free inodes, 0 directories + Free blocks: 6536-6656 Free inodes: 801-832 Group 26: (Blocks 6657-6912) Block bitmap at 6657 (+0), Inode bitmap at 6658 (+1) @@ -1812,10 +1834,11 @@ Group 26: (Blocks 6657-6912) Free inodes: 833-864 Group 27: (Blocks 6913-7168) Backup superblock at 6913, Group descriptors at 6914-6918 - Block bitmap at 6922 (+9), Inode bitmap at 6923 (+10) - Inode table at 6924-6927 (+11) - 244 free blocks, 32 free inodes, 0 directories - Free blocks: 6919-6921, 6928-7168 + Reserved GDT blocks at 6919-7041 + Block bitmap at 7042 (+129), Inode bitmap at 7043 (+130) + Inode table at 7044-7047 (+131) + 121 free blocks, 32 free inodes, 0 directories + Free blocks: 7048-7168 Free inodes: 865-896 Group 28: (Blocks 7169-7424) Block bitmap at 7169 (+0), Inode bitmap at 7170 (+1) @@ -1945,10 +1968,11 @@ Group 48: (Blocks 12289-12544) Free inodes: 1537-1568 Group 49: (Blocks 12545-12800) Backup superblock at 12545, Group descriptors at 12546-12550 - Block bitmap at 12555 (+10), Inode bitmap at 12556 (+11) - Inode table at 12551-12554 (+6) - 244 free blocks, 32 free inodes, 0 directories - Free blocks: 12557-12800 + Reserved GDT blocks at 12551-12673 + Block bitmap at 12674 (+129), Inode bitmap at 12675 (+130) + Inode table at 12676-12679 (+131) + 121 free blocks, 32 free inodes, 0 directories + Free blocks: 12680-12800 Free inodes: 1569-1600 Group 50: (Blocks 12801-13056) Block bitmap at 12801 (+0), Inode bitmap at 12802 (+1) @@ -2138,10 +2162,11 @@ Group 80: (Blocks 20481-20736) Free inodes: 2561-2592 Group 81: (Blocks 20737-20992) Backup superblock at 20737, Group descriptors at 20738-20742 - Block bitmap at 20748 (+11), Inode bitmap at 20743 (+6) - Inode table at 20744-20747 (+7) - 244 free blocks, 32 free inodes, 0 directories - Free blocks: 20749-20992 + Reserved GDT blocks at 20743-20865 + Block bitmap at 20866 (+129), Inode bitmap at 20867 (+130) + Inode table at 20868-20871 (+131) + 121 free blocks, 32 free inodes, 0 directories + Free blocks: 20872-20992 Free inodes: 2593-2624 Group 82: (Blocks 20993-21248) Block bitmap at 20993 (+0), Inode bitmap at 20994 (+1) @@ -2403,10 +2428,11 @@ Group 124: (Blocks 31745-32000) Free inodes: 3969-4000 Group 125: (Blocks 32001-32256) Backup superblock at 32001, Group descriptors at 32002-32006 - Block bitmap at 32007 (+6), Inode bitmap at 32008 (+7) - Inode table at 32009-32012 (+8) - 244 free blocks, 32 free inodes, 0 directories - Free blocks: 32013-32256 + Reserved GDT blocks at 32007-32129 + Block bitmap at 32130 (+129), Inode bitmap at 32131 (+130) + Inode table at 32132-32135 (+131) + 121 free blocks, 32 free inodes, 0 directories + Free blocks: 32136-32256 Free inodes: 4001-4032 Group 126: (Blocks 32257-32512) Block bitmap at 32257 (+0), Inode bitmap at 32258 (+1) diff --git a/tests/r_resize_inode/expect b/tests/r_resize_inode/expect index 319060d..ecd0b7b 100644 --- a/tests/r_resize_inode/expect +++ b/tests/r_resize_inode/expect @@ -16,7 +16,7 @@ Filesystem volume name: Last mounted on: Filesystem magic number: 0xEF53 Filesystem revision #: 1 (dynamic) -Filesystem features: resize_inode filetype sparse_super +Filesystem features: resize_inode dir_index filetype sparse_super Default mount options: (none) Filesystem state: clean Errors behavior: Continue @@ -464,7 +464,7 @@ Filesystem volume name: Last mounted on: Filesystem magic number: 0xEF53 Filesystem revision #: 1 (dynamic) -Filesystem features: resize_inode filetype sparse_super +Filesystem features: resize_inode dir_index filetype sparse_super Default mount options: (none) Filesystem state: clean Errors behavior: Continue @@ -621,7 +621,7 @@ Filesystem volume name: Last mounted on: Filesystem magic number: 0xEF53 Filesystem revision #: 1 (dynamic) -Filesystem features: resize_inode filetype sparse_super +Filesystem features: resize_inode dir_index filetype sparse_super Default mount options: (none) Filesystem state: clean Errors behavior: Continue -- 1.8.3.1