From: Nathan Scott Date: Mon, 22 May 2006 03:51:26 +0000 (+0000) Subject: Drop support for version 1 directories completely. X-Git-Tag: v1.1.0~642 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=4af2ca38f9d048e7f02bfa3daccf2dec0712461f;p=xfstests-dev.git Drop support for version 1 directories completely. Merge of master-melb:xfs-cmds:25994a by kenmcd. --- diff --git a/031 b/031 index 2f37c1bd..2afeac7f 100755 --- a/031 +++ b/031 @@ -84,37 +84,25 @@ _supported_os IRIX Linux _require_nobigloopfs _require_scratch -MKFSV1="-p $tmp.proto -n version=1" -MKFSV2="-p $tmp.proto -n version=2" - # sanity test - default + one root directory entry # Note: must do this proto/mkfs now for later inode size calcs _create_proto 0 -echo "=== version 1, one entry" -_scratch_mkfs_xfs $MKFSV1 >$tmp.mkfs0 2>&1 +echo "=== one entry (shortform)" +_scratch_mkfs_xfs -p $tmp.proto >$tmp.mkfs0 2>&1 _filter_mkfs <$tmp.mkfs0 >/dev/null 2>$tmp.mkfs . $tmp.mkfs _check_repair -echo "=== version 2, one entry (shortform)" -_scratch_mkfs_xfs $MKFSV2 | _filter_mkfs >/dev/null 2>&1 -_check_repair # block-form root directory & repeat _create_proto 20 -echo "=== version 1, twenty entries" -_scratch_mkfs_xfs $MKFSV1 | _filter_mkfs >/dev/null 2>&1 -_check_repair -echo "=== version 2, twenty entries (block form)" -_scratch_mkfs_xfs $MKFSV2 | _filter_mkfs >/dev/null 2>&1 +echo "=== twenty entries (block form)" +_scratch_mkfs_xfs -p $tmp.proto | _filter_mkfs >/dev/null 2>&1 _check_repair # leaf-form root directory & repeat _create_proto 1000 -echo "=== version 1, thousand entries" -_scratch_mkfs_xfs $MKFSV1 | _filter_mkfs >/dev/null 2>&1 -_check_repair -echo "=== version 2, thousand entries (leaf form)" -_scratch_mkfs_xfs $MKFSV2 | _filter_mkfs >/dev/null 2>&1 +echo "=== thousand entries (leaf form)" +_scratch_mkfs_xfs -p $tmp.proto | _filter_mkfs >/dev/null 2>&1 _check_repair # success, all done diff --git a/031.out.irix b/031.out.irix index 6ae039be..32e902d4 100644 --- a/031.out.irix +++ b/031.out.irix @@ -1,5 +1,5 @@ QA output created by 031 -=== version 1, one entry +=== one entry (shortform) Repairing, iteration 1 Phase 1 - find and verify superblock... Phase 2 - zero log... @@ -37,83 +37,7 @@ Phase 6 - check inode connectivity... Phase 7 - verify and correct link counts... done -=== version 2, one entry (shortform) -Repairing, iteration 1 -Phase 1 - find and verify superblock... -Phase 2 - zero log... -Phase 3 - for each AG... -Phase 4 - check for duplicate blocks... -Phase 5 - rebuild AG headers and trees... -Phase 6 - check inode connectivity... -Phase 7 - verify and correct link counts... -done -Repairing, iteration 2 -Phase 1 - find and verify superblock... -Phase 2 - zero log... -Phase 3 - for each AG... -Phase 4 - check for duplicate blocks... -Phase 5 - rebuild AG headers and trees... -Phase 6 - check inode connectivity... -Phase 7 - verify and correct link counts... -done -Repairing, iteration 3 -Phase 1 - find and verify superblock... -Phase 2 - zero log... -Phase 3 - for each AG... -Phase 4 - check for duplicate blocks... -Phase 5 - rebuild AG headers and trees... -Phase 6 - check inode connectivity... -Phase 7 - verify and correct link counts... -done -Repairing, iteration 4 -Phase 1 - find and verify superblock... -Phase 2 - zero log... -Phase 3 - for each AG... -Phase 4 - check for duplicate blocks... -Phase 5 - rebuild AG headers and trees... -Phase 6 - check inode connectivity... -Phase 7 - verify and correct link counts... -done - -=== version 1, twenty entries -Repairing, iteration 1 -Phase 1 - find and verify superblock... -Phase 2 - zero log... -Phase 3 - for each AG... -Phase 4 - check for duplicate blocks... -Phase 5 - rebuild AG headers and trees... -Phase 6 - check inode connectivity... -Phase 7 - verify and correct link counts... -done -Repairing, iteration 2 -Phase 1 - find and verify superblock... -Phase 2 - zero log... -Phase 3 - for each AG... -Phase 4 - check for duplicate blocks... -Phase 5 - rebuild AG headers and trees... -Phase 6 - check inode connectivity... -Phase 7 - verify and correct link counts... -done -Repairing, iteration 3 -Phase 1 - find and verify superblock... -Phase 2 - zero log... -Phase 3 - for each AG... -Phase 4 - check for duplicate blocks... -Phase 5 - rebuild AG headers and trees... -Phase 6 - check inode connectivity... -Phase 7 - verify and correct link counts... -done -Repairing, iteration 4 -Phase 1 - find and verify superblock... -Phase 2 - zero log... -Phase 3 - for each AG... -Phase 4 - check for duplicate blocks... -Phase 5 - rebuild AG headers and trees... -Phase 6 - check inode connectivity... -Phase 7 - verify and correct link counts... -done - -=== version 2, twenty entries (block form) +=== twenty entries (block form) Repairing, iteration 1 Phase 1 - find and verify superblock... Phase 2 - zero log... @@ -155,45 +79,7 @@ rebuilding directory inode INO Phase 7 - verify and correct link counts... done -=== version 1, thousand entries -Repairing, iteration 1 -Phase 1 - find and verify superblock... -Phase 2 - zero log... -Phase 3 - for each AG... -Phase 4 - check for duplicate blocks... -Phase 5 - rebuild AG headers and trees... -Phase 6 - check inode connectivity... -Phase 7 - verify and correct link counts... -done -Repairing, iteration 2 -Phase 1 - find and verify superblock... -Phase 2 - zero log... -Phase 3 - for each AG... -Phase 4 - check for duplicate blocks... -Phase 5 - rebuild AG headers and trees... -Phase 6 - check inode connectivity... -Phase 7 - verify and correct link counts... -done -Repairing, iteration 3 -Phase 1 - find and verify superblock... -Phase 2 - zero log... -Phase 3 - for each AG... -Phase 4 - check for duplicate blocks... -Phase 5 - rebuild AG headers and trees... -Phase 6 - check inode connectivity... -Phase 7 - verify and correct link counts... -done -Repairing, iteration 4 -Phase 1 - find and verify superblock... -Phase 2 - zero log... -Phase 3 - for each AG... -Phase 4 - check for duplicate blocks... -Phase 5 - rebuild AG headers and trees... -Phase 6 - check inode connectivity... -Phase 7 - verify and correct link counts... -done - -=== version 2, thousand entries (leaf form) +=== thousand entries (leaf form) Repairing, iteration 1 Phase 1 - find and verify superblock... Phase 2 - zero log... diff --git a/031.out.linux b/031.out.linux index baebe639..96c83740 100644 --- a/031.out.linux +++ b/031.out.linux @@ -1,5 +1,5 @@ QA output created by 031 -=== version 1, one entry +=== one entry (shortform) Repairing, iteration 1 Phase 1 - find and verify superblock... Phase 2 - using log @@ -37,83 +37,7 @@ Phase 6 - check inode connectivity... Phase 7 - verify and correct link counts... done -=== version 2, one entry (shortform) -Repairing, iteration 1 -Phase 1 - find and verify superblock... -Phase 2 - using log -Phase 3 - for each AG... -Phase 4 - check for duplicate blocks... -Phase 5 - rebuild AG headers and trees... -Phase 6 - check inode connectivity... -Phase 7 - verify and correct link counts... -done -Repairing, iteration 2 -Phase 1 - find and verify superblock... -Phase 2 - using log -Phase 3 - for each AG... -Phase 4 - check for duplicate blocks... -Phase 5 - rebuild AG headers and trees... -Phase 6 - check inode connectivity... -Phase 7 - verify and correct link counts... -done -Repairing, iteration 3 -Phase 1 - find and verify superblock... -Phase 2 - using log -Phase 3 - for each AG... -Phase 4 - check for duplicate blocks... -Phase 5 - rebuild AG headers and trees... -Phase 6 - check inode connectivity... -Phase 7 - verify and correct link counts... -done -Repairing, iteration 4 -Phase 1 - find and verify superblock... -Phase 2 - using log -Phase 3 - for each AG... -Phase 4 - check for duplicate blocks... -Phase 5 - rebuild AG headers and trees... -Phase 6 - check inode connectivity... -Phase 7 - verify and correct link counts... -done - -=== version 1, twenty entries -Repairing, iteration 1 -Phase 1 - find and verify superblock... -Phase 2 - using log -Phase 3 - for each AG... -Phase 4 - check for duplicate blocks... -Phase 5 - rebuild AG headers and trees... -Phase 6 - check inode connectivity... -Phase 7 - verify and correct link counts... -done -Repairing, iteration 2 -Phase 1 - find and verify superblock... -Phase 2 - using log -Phase 3 - for each AG... -Phase 4 - check for duplicate blocks... -Phase 5 - rebuild AG headers and trees... -Phase 6 - check inode connectivity... -Phase 7 - verify and correct link counts... -done -Repairing, iteration 3 -Phase 1 - find and verify superblock... -Phase 2 - using log -Phase 3 - for each AG... -Phase 4 - check for duplicate blocks... -Phase 5 - rebuild AG headers and trees... -Phase 6 - check inode connectivity... -Phase 7 - verify and correct link counts... -done -Repairing, iteration 4 -Phase 1 - find and verify superblock... -Phase 2 - using log -Phase 3 - for each AG... -Phase 4 - check for duplicate blocks... -Phase 5 - rebuild AG headers and trees... -Phase 6 - check inode connectivity... -Phase 7 - verify and correct link counts... -done - -=== version 2, twenty entries (block form) +=== twenty entries (block form) Repairing, iteration 1 Phase 1 - find and verify superblock... Phase 2 - using log @@ -155,45 +79,7 @@ rebuilding directory inode INO Phase 7 - verify and correct link counts... done -=== version 1, thousand entries -Repairing, iteration 1 -Phase 1 - find and verify superblock... -Phase 2 - using log -Phase 3 - for each AG... -Phase 4 - check for duplicate blocks... -Phase 5 - rebuild AG headers and trees... -Phase 6 - check inode connectivity... -Phase 7 - verify and correct link counts... -done -Repairing, iteration 2 -Phase 1 - find and verify superblock... -Phase 2 - using log -Phase 3 - for each AG... -Phase 4 - check for duplicate blocks... -Phase 5 - rebuild AG headers and trees... -Phase 6 - check inode connectivity... -Phase 7 - verify and correct link counts... -done -Repairing, iteration 3 -Phase 1 - find and verify superblock... -Phase 2 - using log -Phase 3 - for each AG... -Phase 4 - check for duplicate blocks... -Phase 5 - rebuild AG headers and trees... -Phase 6 - check inode connectivity... -Phase 7 - verify and correct link counts... -done -Repairing, iteration 4 -Phase 1 - find and verify superblock... -Phase 2 - using log -Phase 3 - for each AG... -Phase 4 - check for duplicate blocks... -Phase 5 - rebuild AG headers and trees... -Phase 6 - check inode connectivity... -Phase 7 - verify and correct link counts... -done - -=== version 2, thousand entries (leaf form) +=== thousand entries (leaf form) Repairing, iteration 1 Phase 1 - find and verify superblock... Phase 2 - using log