From patchwork Fri Oct 29 06:59:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shiyang Ruan X-Patchwork-Id: 12591869 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8AC1DC4332F for ; Fri, 29 Oct 2021 07:00:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6FCFF60F93 for ; Fri, 29 Oct 2021 07:00:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230252AbhJ2HCc (ORCPT ); Fri, 29 Oct 2021 03:02:32 -0400 Received: from mail.cn.fujitsu.com ([183.91.158.132]:64478 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S232136AbhJ2HCc (ORCPT ); Fri, 29 Oct 2021 03:02:32 -0400 IronPort-Data: A9a23:yGoUY61Yxw072HlPhPbD5c9zkn2cJEfYwER7XOPLsXnJ3Wxw1DQEyWceWzqBM6nfY2HxfY9/O9uzo0gBscDVnNI2QQE+nZ1PZygU8JKaX7x1DatR0xu6d5SFFAQ+hyknQoGowPscEzmM+X9BDpC79SMljPnSFuKnYAL5EnsZqTFMGX5JZS1Ly7ZRbr5A2bBVMivV0T/Ai5S31GyNh1aYBlkpB5er83uDihhdVAQw5TTSbdgT1LPXeuJ84Jg3fcldJFOgKmVY83LTegrN8F251juxExYFAdXjnKv5c1ERX/jZOg3mZnh+AvDk20Yd4HdplPtT2Pk0MC+7jx2Tgtl308QLu5qrVS8nI6/NhP8AFRJfFkmSOIUfoeGafing7ZL7I0ruNiGEL+9VJE8tIYAD5v1fH25D77obJSoLYxTFgPi5qI9X4MEEat8LdZGtZd1A/Co7i2yxMBrveribK42i2DOS9GtYahhyIMvj IronPort-HdrOrdr: A9a23:0IIAQ6pkjWw8ZdmvDy7Ra9QaV5oXeYIsimQD101hICG9E/bo8/xG+c536faaslgssQ4b8+xoVJPgfZq+z+8R3WByB8bAYOCOggLBQ72KhrGSoQEIdRefysdtkY9kc4VbTOb7FEVGi6/BizWQIpINx8am/cmT6dvj8w== X-IronPort-AV: E=Sophos;i="5.87,191,1631548800"; d="scan'208";a="116579746" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 29 Oct 2021 15:00:01 +0800 Received: from G08CNEXMBPEKD04.g08.fujitsu.local (unknown [10.167.33.201]) by cn.fujitsu.com (Postfix) with ESMTP id E9D764D0F90F for ; Fri, 29 Oct 2021 14:59:58 +0800 (CST) Received: from G08CNEXCHPEKD09.g08.fujitsu.local (10.167.33.85) by G08CNEXMBPEKD04.g08.fujitsu.local (10.167.33.201) with Microsoft SMTP Server (TLS) id 15.0.1497.23; Fri, 29 Oct 2021 14:59:54 +0800 Received: from irides.mr.mr.mr (10.167.225.141) by G08CNEXCHPEKD09.g08.fujitsu.local (10.167.33.209) with Microsoft SMTP Server id 15.0.1497.23 via Frontend Transport; Fri, 29 Oct 2021 14:59:51 +0800 From: Shiyang Ruan To: Subject: [PATCH 1/3] generic/138,139,140: fix the name for check file Date: Fri, 29 Oct 2021 14:59:41 +0800 Message-ID: <20211029065943.3556529-2-ruansy.fnst@fujitsu.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211029065943.3556529-1-ruansy.fnst@fujitsu.com> References: <20211029065943.3556529-1-ruansy.fnst@fujitsu.com> MIME-Version: 1.0 X-yoursite-MailScanner-ID: E9D764D0F90F.A4A2B X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: ruansy.fnst@fujitsu.com Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org The original 'file3' is used to check if the result after operation on file2 is correct. So, rename it to be 'file2.chk' to make it easier to understand. Signed-off-by: Shiyang Ruan Reviewed-by: Darrick J. Wong --- tests/generic/138 | 54 +++++++++++++++++++++---------------------- tests/generic/138.out | 8 +++---- tests/generic/139 | 54 +++++++++++++++++++++---------------------- tests/generic/139.out | 8 +++---- tests/generic/140 | 54 +++++++++++++++++++++---------------------- tests/generic/140.out | 8 +++---- 6 files changed, 93 insertions(+), 93 deletions(-) diff --git a/tests/generic/138 b/tests/generic/138 index 1037ed3e..d061ac34 100755 --- a/tests/generic/138 +++ b/tests/generic/138 @@ -35,37 +35,37 @@ echo "Create the original files" blksz=65536 _pwrite_byte 0x61 0 $((blksz * 48 - 3)) $testdir/file1 >> $seqres.full _cp_reflink $testdir/file1 $testdir/file2 >> $seqres.full -_pwrite_byte 0x61 0 $((blksz * 48 - 3)) $testdir/file3 >> $seqres.full +_pwrite_byte 0x61 0 $((blksz * 48 - 3)) $testdir/file2.chk >> $seqres.full _test_cycle_mount echo "Compare files" md5sum $testdir/file1 | _filter_test_dir md5sum $testdir/file2 | _filter_test_dir -md5sum $testdir/file3 | _filter_test_dir +md5sum $testdir/file2.chk | _filter_test_dir -cmp -s $testdir/file1 $testdir/file2 || echo "Files 1-2 do not match" -cmp -s $testdir/file1 $testdir/file3 || echo "Files 1-3 do not match" -cmp -s $testdir/file2 $testdir/file3 || echo "Files 2-3 do not match" +cmp -s $testdir/file1 $testdir/file2 || echo "file1 and file2 do not match" +cmp -s $testdir/file1 $testdir/file2.chk || echo "file1 and file2.chk do not match" +cmp -s $testdir/file2 $testdir/file2.chk || echo "file1 and file2.chk do not match" echo "pagecache CoW the second file" _pwrite_byte 0x62 0 17 $testdir/file2 >> $seqres.full -_pwrite_byte 0x62 0 17 $testdir/file3 >> $seqres.full +_pwrite_byte 0x62 0 17 $testdir/file2.chk >> $seqres.full _pwrite_byte 0x62 $((blksz * 16 - 34)) 17 $testdir/file2 >> $seqres.full -_pwrite_byte 0x62 $((blksz * 16 - 34)) 17 $testdir/file3 >> $seqres.full +_pwrite_byte 0x62 $((blksz * 16 - 34)) 17 $testdir/file2.chk >> $seqres.full _pwrite_byte 0x62 $((blksz * 48 - 8)) 17 $testdir/file2 >> $seqres.full -_pwrite_byte 0x62 $((blksz * 48 - 8)) 17 $testdir/file3 >> $seqres.full +_pwrite_byte 0x62 $((blksz * 48 - 8)) 17 $testdir/file2.chk >> $seqres.full _test_cycle_mount echo "Compare files" md5sum $testdir/file1 | _filter_test_dir md5sum $testdir/file2 | _filter_test_dir -md5sum $testdir/file3 | _filter_test_dir +md5sum $testdir/file2.chk | _filter_test_dir -cmp -s $testdir/file1 $testdir/file2 || echo "Files 1-2 do not match (intentional)" -cmp -s $testdir/file1 $testdir/file3 || echo "Files 1-3 do not match (intentional)" -cmp -s $testdir/file2 $testdir/file3 || echo "Files 2-3 do not match" +cmp -s $testdir/file1 $testdir/file2 || echo "file1 and file2 do not match (intentional)" +cmp -s $testdir/file1 $testdir/file2.chk || echo "file1 and file2.chk do not match (intentional)" +cmp -s $testdir/file2 $testdir/file2.chk || echo "file2 and file2.chk do not match" echo "Compare the CoW'd section to the before file" _compare_range $testdir/file1 0 $testdir/file2 0 17 \ @@ -80,47 +80,47 @@ _compare_range $testdir/file1 $((blksz * 48 - 8)) \ || echo "End sections do not match (intentional)" echo "Compare the CoW'd section to the after file" -_compare_range $testdir/file2 0 $testdir/file3 0 17 \ +_compare_range $testdir/file2 0 $testdir/file2.chk 0 17 \ || echo "Start sections do not match" _compare_range $testdir/file2 $((blksz * 16 - 34)) \ - $testdir/file3 $((blksz * 16 - 34)) 17 \ + $testdir/file2.chk $((blksz * 16 - 34)) 17 \ || echo "Middle sections do not match" _compare_range $testdir/file2 $((blksz * 48 - 8)) \ - $testdir/file3 $((blksz * 48 - 8)) 17 \ + $testdir/file2.chk $((blksz * 48 - 8)) 17 \ || echo "End sections do not match" echo "Compare the not CoW'd sections" _compare_range $testdir/file1 18 $testdir/file2 18 17 \ - || echo "Start sections of 1-2 do not match" + || echo "Start sections of file1 and file2 do not match" -_compare_range $testdir/file2 18 $testdir/file3 18 17 \ - || echo "Start sections of 2-3 do not match" +_compare_range $testdir/file2 18 $testdir/file2.chk 18 17 \ + || echo "Start sections of file2 and file2.chk do not match" _compare_range $testdir/file1 $((blksz * 16 - 17)) \ $testdir/file2 $((blksz * 16 - 17)) 82 \ - || echo "Middle sections of 1-2 do not match" + || echo "Middle sections of file1 and file2 do not match" _compare_range $testdir/file2 $((blksz * 16 - 17)) \ - $testdir/file3 $((blksz * 16 - 17)) 82 \ - || echo "Middle sections of 2-3 do not match" + $testdir/file2.chk $((blksz * 16 - 17)) 82 \ + || echo "Middle sections of file2 and file2.chk do not match" _compare_range $testdir/file1 $((blksz * 48 - 108)) \ $testdir/file2 $((blksz * 48 - 108)) 100 \ - || echo "End sections of 1-2 do not match" + || echo "End sections of file1 and file2 do not match" _compare_range $testdir/file2 $((blksz * 48 - 108)) \ - $testdir/file3 $((blksz * 48 - 108)) 100 \ - || echo "End sections of 2-3 do not match" + $testdir/file2.chk $((blksz * 48 - 108)) 100 \ + || echo "End sections of file2 and file2.chk do not match" _compare_range $testdir/file1 $((blksz * 14)) \ $testdir/file2 $((blksz * 14)) $blksz \ - || echo "Untouched sections of 1-2 do not match" + || echo "Untouched sections of file1 and file2 do not match" _compare_range $testdir/file2 $((blksz * 14)) \ - $testdir/file3 $((blksz * 14)) $blksz \ - || echo "Untouched sections of 2-3 do not match" + $testdir/file2.chk $((blksz * 14)) $blksz \ + || echo "Untouched sections of file2 and file2.chk do not match" # success, all done status=0 diff --git a/tests/generic/138.out b/tests/generic/138.out index b0cafabe..60cd876e 100644 --- a/tests/generic/138.out +++ b/tests/generic/138.out @@ -3,14 +3,14 @@ Create the original files Compare files 60ebe700450b6015c17fa15cacb9493b TEST_DIR/test-138/file1 60ebe700450b6015c17fa15cacb9493b TEST_DIR/test-138/file2 -60ebe700450b6015c17fa15cacb9493b TEST_DIR/test-138/file3 +60ebe700450b6015c17fa15cacb9493b TEST_DIR/test-138/file2.chk pagecache CoW the second file Compare files 60ebe700450b6015c17fa15cacb9493b TEST_DIR/test-138/file1 4a879c2f322121f6f4b8ebede1909a7c TEST_DIR/test-138/file2 -4a879c2f322121f6f4b8ebede1909a7c TEST_DIR/test-138/file3 -Files 1-2 do not match (intentional) -Files 1-3 do not match (intentional) +4a879c2f322121f6f4b8ebede1909a7c TEST_DIR/test-138/file2.chk +file1 and file2 do not match (intentional) +file1 and file2.chk do not match (intentional) Compare the CoW'd section to the before file Start sections do not match (intentional) Middle sections do not match (intentional) diff --git a/tests/generic/139 b/tests/generic/139 index 6422f66a..0bbc222c 100755 --- a/tests/generic/139 +++ b/tests/generic/139 @@ -36,37 +36,37 @@ echo "Create the original files" blksz=65536 _pwrite_byte 0x61 0 $((blksz * 48 - 3)) $testdir/file1 >> $seqres.full _cp_reflink $testdir/file1 $testdir/file2 >> $seqres.full -_pwrite_byte 0x61 0 $((blksz * 48 - 3)) $testdir/file3 >> $seqres.full +_pwrite_byte 0x61 0 $((blksz * 48 - 3)) $testdir/file2.chk >> $seqres.full _test_cycle_mount echo "Compare files" md5sum $testdir/file1 | _filter_test_dir md5sum $testdir/file2 | _filter_test_dir -md5sum $testdir/file3 | _filter_test_dir +md5sum $testdir/file2.chk | _filter_test_dir -cmp -s $testdir/file1 $testdir/file2 || echo "Files 1-2 should match" -cmp -s $testdir/file1 $testdir/file3 || echo "Files 1-3 should match" -cmp -s $testdir/file2 $testdir/file3 || echo "Files 2-3 should match" +cmp -s $testdir/file1 $testdir/file2 || echo "file1 and file2 should match" +cmp -s $testdir/file1 $testdir/file2.chk || echo "file1 and file2.chk should match" +cmp -s $testdir/file2 $testdir/file2.chk || echo "file2 and file2.chk should match" echo "directio CoW the second file" _pwrite_byte 0x62 0 $blksz $testdir/file2 -d >> $seqres.full -_pwrite_byte 0x62 0 $blksz $testdir/file3 -d >> $seqres.full +_pwrite_byte 0x62 0 $blksz $testdir/file2.chk -d >> $seqres.full _pwrite_byte 0x62 $((blksz * 16 - 512)) 512 $testdir/file2 -d >> $seqres.full -_pwrite_byte 0x62 $((blksz * 16 - 512)) 512 $testdir/file3 -d >> $seqres.full +_pwrite_byte 0x62 $((blksz * 16 - 512)) 512 $testdir/file2.chk -d >> $seqres.full _pwrite_byte 0x62 $((blksz * 48)) $blksz $testdir/file2 -d >> $seqres.full -_pwrite_byte 0x62 $((blksz * 48)) $blksz $testdir/file3 -d >> $seqres.full +_pwrite_byte 0x62 $((blksz * 48)) $blksz $testdir/file2.chk -d >> $seqres.full _test_cycle_mount echo "Compare files" md5sum $testdir/file1 | _filter_test_dir md5sum $testdir/file2 | _filter_test_dir -md5sum $testdir/file3 | _filter_test_dir +md5sum $testdir/file2.chk | _filter_test_dir -cmp -s $testdir/file1 $testdir/file2 || echo "Files 1-2 should not match (intentional)" -cmp -s $testdir/file1 $testdir/file3 || echo "Files 1-3 should not match (intentional)" -cmp -s $testdir/file2 $testdir/file3 || echo "Files 2-3 should match" +cmp -s $testdir/file1 $testdir/file2 || echo "file1 and file2 should not match (intentional)" +cmp -s $testdir/file1 $testdir/file2.chk || echo "file1 and file2.chk should not match (intentional)" +cmp -s $testdir/file2 $testdir/file2.chk || echo "file2 and file2.chk should match" echo "Compare the CoW'd section to the before file" _compare_range $testdir/file1 0 $testdir/file2 0 $blksz \ @@ -81,46 +81,46 @@ _compare_range $testdir/file1 $((blksz * 48 - 512)) \ || echo "End sections do not match (intentional)" echo "Compare the CoW'd section to the after file" -_compare_range $testdir/file2 0 $testdir/file3 0 $blksz \ +_compare_range $testdir/file2 0 $testdir/file2.chk 0 $blksz \ || echo "Start sections do not match" _compare_range $testdir/file2 $((blksz * 16 - 512)) \ - $testdir/file3 $((blksz * 16 - 512)) 512 \ + $testdir/file2.chk $((blksz * 16 - 512)) 512 \ || echo "Middle sections do not match" _compare_range $testdir/file2 $((blksz * 48 - 512)) \ - $testdir/file3 $((blksz * 48 - 512)) $blksz \ + $testdir/file2.chk $((blksz * 48 - 512)) $blksz \ || echo "End sections do not match" echo "Compare the not CoW'd sections" _compare_range $testdir/file1 $blksz $testdir/file2 $blksz 512 \ - || echo "Start sections of 1-2 do not match" -_compare_range $testdir/file2 $blksz $testdir/file3 $blksz 512 \ - || echo "Start sections of 2-3 do not match" + || echo "Start sections of file1 and file2 do not match" +_compare_range $testdir/file2 $blksz $testdir/file2.chk $blksz 512 \ + || echo "Start sections of file2 and file2.chk do not match" _compare_range $testdir/file1 $((blksz * 16 - 1024)) \ $testdir/file2 $((blksz * 16 - 1024)) 512 \ - || echo "Middle sections of 1-2 do not match" + || echo "Middle sections of file1 and file2 do not match" _compare_range $testdir/file2 $((blksz * 16 - 1024)) \ - $testdir/file3 $((blksz * 16 - 1024)) 512 \ - || echo "Middle sections of 2-3 do not match" + $testdir/file2.chk $((blksz * 16 - 1024)) 512 \ + || echo "Middle sections of file2 and file2.chk do not match" _compare_range $testdir/file1 $((blksz * 48 - 1024)) \ $testdir/file2 $((blksz * 48 - 1024)) 512 \ - || echo "End sections of 1-2 do not match" + || echo "End sections of file1 and file2 do not match" _compare_range $testdir/file2 $((blksz * 48 - 1024)) \ - $testdir/file3 $((blksz * 48 - 1024)) 512 \ - || echo "End sections of 2-3 do not match" + $testdir/file2.chk $((blksz * 48 - 1024)) 512 \ + || echo "End sections of file2 and file2.chk do not match" _compare_range $testdir/file1 $((blksz * 16)) \ $testdir/file2 $((blksz * 16)) 512 \ - || echo "Untouched sections of 1-2 do not match" + || echo "Untouched sections of file1 and file2 do not match" _compare_range $testdir/file2 $((blksz * 16)) \ - $testdir/file3 $((blksz * 16)) 512 \ - || echo "Untouched sections of 2-3 do not match" + $testdir/file2.chk $((blksz * 16)) 512 \ + || echo "Untouched sections of file2 and file2.chk do not match" # success, all done status=0 diff --git a/tests/generic/139.out b/tests/generic/139.out index 28d04f5f..56d6c9f9 100644 --- a/tests/generic/139.out +++ b/tests/generic/139.out @@ -3,14 +3,14 @@ Create the original files Compare files 60ebe700450b6015c17fa15cacb9493b TEST_DIR/test-139/file1 60ebe700450b6015c17fa15cacb9493b TEST_DIR/test-139/file2 -60ebe700450b6015c17fa15cacb9493b TEST_DIR/test-139/file3 +60ebe700450b6015c17fa15cacb9493b TEST_DIR/test-139/file2.chk directio CoW the second file Compare files 60ebe700450b6015c17fa15cacb9493b TEST_DIR/test-139/file1 ff5626fb6c71b242d6b1a43de25c9a85 TEST_DIR/test-139/file2 -ff5626fb6c71b242d6b1a43de25c9a85 TEST_DIR/test-139/file3 -Files 1-2 should not match (intentional) -Files 1-3 should not match (intentional) +ff5626fb6c71b242d6b1a43de25c9a85 TEST_DIR/test-139/file2.chk +file1 and file2 should not match (intentional) +file1 and file2.chk should not match (intentional) Compare the CoW'd section to the before file Start sections do not match (intentional) Middle sections do not match (intentional) diff --git a/tests/generic/140 b/tests/generic/140 index 6cba5791..52cf07dc 100755 --- a/tests/generic/140 +++ b/tests/generic/140 @@ -35,37 +35,37 @@ echo "Create the original files" blksz=65536 _pwrite_byte 0x61 0 $((blksz * 48 - 3)) $testdir/file1 >> $seqres.full _cp_reflink $testdir/file1 $testdir/file2 >> $seqres.full -_pwrite_byte 0x61 0 $((blksz * 48 - 3)) $testdir/file3 >> $seqres.full +_pwrite_byte 0x61 0 $((blksz * 48 - 3)) $testdir/file2.chk >> $seqres.full _test_cycle_mount echo "Compare files" md5sum $testdir/file1 | _filter_test_dir md5sum $testdir/file2 | _filter_test_dir -md5sum $testdir/file3 | _filter_test_dir +md5sum $testdir/file2.chk | _filter_test_dir -cmp -s $testdir/file1 $testdir/file2 || echo "Files 1-2 do not match" -cmp -s $testdir/file1 $testdir/file3 || echo "Files 1-3 do not match" -cmp -s $testdir/file2 $testdir/file3 || echo "Files 2-3 do not match" +cmp -s $testdir/file1 $testdir/file2 || echo "file1 and file2 do not match" +cmp -s $testdir/file1 $testdir/file2.chk || echo "file1 and file2.chk do not match" +cmp -s $testdir/file2 $testdir/file2.chk || echo "file2 and file2.chk do not match" echo "mmap CoW the second file" _mwrite_byte 0x62 0 17 $((blksz * 48 - 3)) $testdir/file2 >> $seqres.full -_mwrite_byte 0x62 0 17 $((blksz * 48 - 3)) $testdir/file3 >> $seqres.full +_mwrite_byte 0x62 0 17 $((blksz * 48 - 3)) $testdir/file2.chk >> $seqres.full _mwrite_byte 0x62 $((blksz * 16 - 34)) 17 $((blksz * 48 - 3)) $testdir/file2 >> $seqres.full -_mwrite_byte 0x62 $((blksz * 16 - 34)) 17 $((blksz * 48 - 3)) $testdir/file3 >> $seqres.full +_mwrite_byte 0x62 $((blksz * 16 - 34)) 17 $((blksz * 48 - 3)) $testdir/file2.chk >> $seqres.full _mwrite_byte 0x62 $((blksz * 48 - 20)) 17 $((blksz * 48 - 3)) $testdir/file2 >> $seqres.full -_mwrite_byte 0x62 $((blksz * 48 - 20)) 17 $((blksz * 48 - 3)) $testdir/file3 >> $seqres.full +_mwrite_byte 0x62 $((blksz * 48 - 20)) 17 $((blksz * 48 - 3)) $testdir/file2.chk >> $seqres.full _test_cycle_mount echo "Compare files" md5sum $testdir/file1 | _filter_test_dir md5sum $testdir/file2 | _filter_test_dir -md5sum $testdir/file3 | _filter_test_dir +md5sum $testdir/file2.chk | _filter_test_dir -cmp -s $testdir/file1 $testdir/file2 || echo "Files 1-2 do not match (intentional)" -cmp -s $testdir/file1 $testdir/file3 || echo "Files 1-3 do not match (intentional)" -cmp -s $testdir/file2 $testdir/file3 || echo "Files 2-3 do not match" +cmp -s $testdir/file1 $testdir/file2 || echo "file1 and file2 do not match (intentional)" +cmp -s $testdir/file1 $testdir/file2.chk || echo "file1 and file2.chk do not match (intentional)" +cmp -s $testdir/file2 $testdir/file2.chk || echo "file2 and file2.chk do not match" echo "Compare the CoW'd section to the before file" _compare_range $testdir/file1 0 $testdir/file2 0 17 \ @@ -80,47 +80,47 @@ _compare_range $testdir/file1 $((blksz * 48 - 20)) \ || echo "End sections do not match (intentional)" echo "Compare the CoW'd section to the after file" -_compare_range $testdir/file2 0 $testdir/file3 0 17 \ +_compare_range $testdir/file2 0 $testdir/file2.chk 0 17 \ || echo "Start sections do not match" _compare_range $testdir/file2 $((blksz * 16 - 34)) \ - $testdir/file3 $((blksz * 16 - 34)) 17 \ + $testdir/file2.chk $((blksz * 16 - 34)) 17 \ || echo "Middle sections do not match" _compare_range $testdir/file2 $((blksz * 48 - 20)) \ - $testdir/file3 $((blksz * 48 - 20)) 17 \ + $testdir/file2.chk $((blksz * 48 - 20)) 17 \ || echo "End sections do not match" echo "Compare the not CoW'd sections" _compare_range $testdir/file1 18 $testdir/file2 18 17 \ - || echo "Start sections of 1-2 do not match" + || echo "Start sections of file1 and file2 do not match" -_compare_range $testdir/file2 18 $testdir/file3 18 17 \ - || echo "Start sections of 2-3 do not match" +_compare_range $testdir/file2 18 $testdir/file2.chk 18 17 \ + || echo "Start sections of file2 and file2.chk do not match" _compare_range $testdir/file1 $((blksz * 16 - 17)) \ $testdir/file2 $((blksz * 16 - 17)) 82 \ - || echo "Middle sections of 1-2 do not match" + || echo "Middle sections of file1 and file2 do not match" _compare_range $testdir/file2 $((blksz * 16 - 17)) \ - $testdir/file3 $((blksz * 16 - 17)) 82 \ - || echo "Middle sections of 2-3 do not match" + $testdir/file2.chk $((blksz * 16 - 17)) 82 \ + || echo "Middle sections of file2 and file2.chk do not match" _compare_range $testdir/file1 $((blksz * 48 - 120)) \ $testdir/file2 $((blksz * 48 - 120)) 100 \ - || echo "End sections of 1-2 do not match" + || echo "End sections of file1 and file2 do not match" _compare_range $testdir/file2 $((blksz * 48 - 120)) \ - $testdir/file3 $((blksz * 48 - 120)) 100 \ - || echo "End sections of 2-3 do not match" + $testdir/file2.chk $((blksz * 48 - 120)) 100 \ + || echo "End sections of file2 and file2.chk do not match" _compare_range $testdir/file1 $((blksz * 14)) \ $testdir/file2 $((blksz * 14)) $blksz \ - || echo "Untouched sections of 1-2 do not match" + || echo "Untouched sections of file1 and file2 do not match" _compare_range $testdir/file2 $((blksz * 14)) \ - $testdir/file3 $((blksz * 14)) $blksz \ - || echo "Untouched sections of 2-3 do not match" + $testdir/file2.chk $((blksz * 14)) $blksz \ + || echo "Untouched sections of file2 and file2.chk do not match" # success, all done status=0 diff --git a/tests/generic/140.out b/tests/generic/140.out index 51a5b854..89389001 100644 --- a/tests/generic/140.out +++ b/tests/generic/140.out @@ -3,14 +3,14 @@ Create the original files Compare files 60ebe700450b6015c17fa15cacb9493b TEST_DIR/test-140/file1 60ebe700450b6015c17fa15cacb9493b TEST_DIR/test-140/file2 -60ebe700450b6015c17fa15cacb9493b TEST_DIR/test-140/file3 +60ebe700450b6015c17fa15cacb9493b TEST_DIR/test-140/file2.chk mmap CoW the second file Compare files 60ebe700450b6015c17fa15cacb9493b TEST_DIR/test-140/file1 795ecfd281dbda4916431376228e4187 TEST_DIR/test-140/file2 -795ecfd281dbda4916431376228e4187 TEST_DIR/test-140/file3 -Files 1-2 do not match (intentional) -Files 1-3 do not match (intentional) +795ecfd281dbda4916431376228e4187 TEST_DIR/test-140/file2.chk +file1 and file2 do not match (intentional) +file1 and file2.chk do not match (intentional) Compare the CoW'd section to the before file Start sections do not match (intentional) Middle sections do not match (intentional) From patchwork Fri Oct 29 06:59:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shiyang Ruan X-Patchwork-Id: 12591867 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1399BC433F5 for ; Fri, 29 Oct 2021 07:00:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EC07E60F93 for ; Fri, 29 Oct 2021 07:00:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232141AbhJ2HCb (ORCPT ); Fri, 29 Oct 2021 03:02:31 -0400 Received: from mail.cn.fujitsu.com ([183.91.158.132]:45817 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S232024AbhJ2HCa (ORCPT ); Fri, 29 Oct 2021 03:02:30 -0400 IronPort-Data: A9a23:NG6UbKtUylqtr92VPI+531ZO3ufnVEpcMUV32f8akzHdYEJGY0x3yDFKWDqCPv7bYDf2fd0gb96y8UxTusKHmtQ1Glc/r3pgHilAwSbnLY7Hdx+vZUt+DSFioHpPtpxYMp+ZRCwNZie0SiyFb/6x8hGQ6YnSHuClUbaeangqLeNZYHxJZSxLyrdRbrFA0YDR7zOl4bsekuWHULOX82cc3lE8t8pvnChSUMHa41v0iLCRicdj5zcyn1FNZH4WyDrYw3HQGuG4FcbiLwrPIS3Qw4/Xw/stIovNfrfTeUtMTKPQPBSVlzxdXK3Kbhpq/3R0i/hkcqFHLxo/ZzahxridzP1XqJW2UhZvMKvXhMwTThtZDzpje6ZB/dcrJFDm6JLOkByZLySEL/JGSRte0Zcj0uhsHWxV6ecwNj8AdFaAiviwzbb9TfNj7vnPhuGD0Jg34ykmlG+GS619B82rfkkD3vcAtB9YuyyENaq2ixIlVAdS IronPort-HdrOrdr: A9a23:KKb6vaOnGNLp6MBcTv2jsMiBIKoaSvp037BL7TEUdfUxSKGlfq+V8sjzqiWftN98YhAdcLO7Scy9qBHnhP1ICOAqVN/MYOCMghrLEGgN1+vf6gylMyj/28oY7q14bpV5YeeaMXFKyer8/ym0euxN/OW6 X-IronPort-AV: E=Sophos;i="5.87,191,1631548800"; d="scan'208";a="116579747" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 29 Oct 2021 15:00:01 +0800 Received: from G08CNEXMBPEKD06.g08.fujitsu.local (unknown [10.167.33.206]) by cn.fujitsu.com (Postfix) with ESMTP id 925C94D0F910 for ; Fri, 29 Oct 2021 14:59:59 +0800 (CST) Received: from G08CNEXCHPEKD09.g08.fujitsu.local (10.167.33.85) by G08CNEXMBPEKD06.g08.fujitsu.local (10.167.33.206) with Microsoft SMTP Server (TLS) id 15.0.1497.23; Fri, 29 Oct 2021 14:59:58 +0800 Received: from irides.mr.mr.mr (10.167.225.141) by G08CNEXCHPEKD09.g08.fujitsu.local (10.167.33.209) with Microsoft SMTP Server id 15.0.1497.23 via Frontend Transport; Fri, 29 Oct 2021 14:59:57 +0800 From: Shiyang Ruan To: Subject: [PATCH 2/3] generic: fix description or typo in head comment Date: Fri, 29 Oct 2021 14:59:42 +0800 Message-ID: <20211029065943.3556529-3-ruansy.fnst@fujitsu.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211029065943.3556529-1-ruansy.fnst@fujitsu.com> References: <20211029065943.3556529-1-ruansy.fnst@fujitsu.com> MIME-Version: 1.0 X-yoursite-MailScanner-ID: 925C94D0F910.A0C05 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: ruansy.fnst@fujitsu.com Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org 1. update description according to the current testcase 2. "an the end -> at the end" Signed-off-by: Shiyang Ruan --- tests/generic/155 | 3 +-- tests/generic/269 | 2 +- tests/generic/270 | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/generic/155 b/tests/generic/155 index 2fe7894a..13292fbb 100755 --- a/tests/generic/155 +++ b/tests/generic/155 @@ -13,8 +13,7 @@ # - CoW all the rest of the blocks of the copies # - Compare fs block usage to (2), (1), and (0) # -# The main difference from 834 is that we use zero range, directio, and -# mmap to mix things up a bit. +# The main difference from No. 154 is that we use zero range to execute CoW. # . ./common/preamble _begin_fstest auto quick clone zero diff --git a/tests/generic/269 b/tests/generic/269 index d78b7463..60a07b44 100755 --- a/tests/generic/269 +++ b/tests/generic/269 @@ -4,7 +4,7 @@ # # FSQA Test No. 269 # -# Run fsstress and ENSPC hitters in parallel, check fs consistency an the end +# Run fsstress and ENSPC hitters in parallel, check fs consistency at the end # . ./common/preamble _begin_fstest auto rw prealloc ioctl enospc stress diff --git a/tests/generic/270 b/tests/generic/270 index 1fb5795a..35141e05 100755 --- a/tests/generic/270 +++ b/tests/generic/270 @@ -5,7 +5,7 @@ # FSQA Test No. 270 # # Run fsstress and ENSPC hitters in parallel, check quota and -# fs consistency an the end +# fs consistency at the end # . ./common/preamble _begin_fstest auto quota rw prealloc ioctl enospc stress From patchwork Fri Oct 29 06:59:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shiyang Ruan X-Patchwork-Id: 12591865 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9338FC433EF for ; Fri, 29 Oct 2021 07:00:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6A7D060F02 for ; Fri, 29 Oct 2021 07:00:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232140AbhJ2HCa (ORCPT ); Fri, 29 Oct 2021 03:02:30 -0400 Received: from mail.cn.fujitsu.com ([183.91.158.132]:64478 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S230252AbhJ2HCa (ORCPT ); Fri, 29 Oct 2021 03:02:30 -0400 IronPort-Data: A9a23:Uco8RapCzrdDVsOPfq0zioOvbDNeBmIEZxIvgKrLsJaIsI5as4F+vjZKDz2HbKmNYGumfdwnOoXi8UpXuMfQmtAwHgFuqi1kQiMRo6IpJ/zDcB6oYHn6wu4v7a5fx5xHLIGGdajYd1eEzvuWGuWn/SYUOZ2gHOKmUbecYHApHmeIdQ964f5ds79g6mJXqYjha++9kYuaT/z3YDdJ6RYtWo4nw/7rRCdUgRjHkGhwUmrSyhx8lAS2e3E9VPrzLEwqRpfyatE88uWSH44vwFwll1418SvBCvv9+lr6WkYMBLDPPwmSkWcQUK+n6vRAjnVqlP9la7xHMgEK49mKt4kZJNFlr4G5Txw4eKPKg/g1XQRaEj1lIOtN/7qvzX2X6JXNkhKXLCexqxlpJARsVWECwc55Gn1D7uADAC4CYwrFhO+sxr+/DO52iawewGPDVG8Ekig4i2iHUrB9GtaeK5gmLORwhF8Y7v2i196HDybBVQdSUQ== IronPort-HdrOrdr: A9a23:LqkydanQ4oJAcH9VWtK0cwsXl0/pDfIQ3DAbv31ZSRFFG/Fw9vre+MjzsCWYtN9/Yh8dcK+7UpVoLUm8yXcX2/h1AV7BZniEhILAFugLgrcKqAeQeREWmNQ86Y5QN4B6CPDVSWNxlNvG5mCDeOoI8Z2q97+JiI7lo0tQcQ== X-IronPort-AV: E=Sophos;i="5.87,191,1631548800"; d="scan'208";a="116579745" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 29 Oct 2021 15:00:01 +0800 Received: from G08CNEXMBPEKD04.g08.fujitsu.local (unknown [10.167.33.201]) by cn.fujitsu.com (Postfix) with ESMTP id 437894D0F90D for ; Fri, 29 Oct 2021 15:00:00 +0800 (CST) Received: from G08CNEXCHPEKD09.g08.fujitsu.local (10.167.33.85) by G08CNEXMBPEKD04.g08.fujitsu.local (10.167.33.201) with Microsoft SMTP Server (TLS) id 15.0.1497.23; Fri, 29 Oct 2021 15:00:00 +0800 Received: from irides.mr.mr.mr (10.167.225.141) by G08CNEXCHPEKD09.g08.fujitsu.local (10.167.33.209) with Microsoft SMTP Server id 15.0.1497.23 via Frontend Transport; Fri, 29 Oct 2021 14:59:58 +0800 From: Shiyang Ruan To: Subject: [PATCH 3/3] generic/201: fix the description Date: Fri, 29 Oct 2021 14:59:43 +0800 Message-ID: <20211029065943.3556529-4-ruansy.fnst@fujitsu.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211029065943.3556529-1-ruansy.fnst@fujitsu.com> References: <20211029065943.3556529-1-ruansy.fnst@fujitsu.com> MIME-Version: 1.0 X-yoursite-MailScanner-ID: 437894D0F90D.ADBEE X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: ruansy.fnst@fujitsu.com Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org This case is test for 'unlink', and there is no umount operation here. Signed-off-by: Shiyang Ruan Reviewed-by: Darrick J. Wong --- tests/generic/201 | 2 +- tests/generic/201.out | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/generic/201 b/tests/generic/201 index 9b65445a..2598b44a 100755 --- a/tests/generic/201 +++ b/tests/generic/201 @@ -50,7 +50,7 @@ md5sum $testdir/file1 | _filter_scratch md5sum $testdir/file3 | _filter_scratch md5sum $testdir/file3.chk | _filter_scratch -echo "CoW and unmount" +echo "CoW and unlink" cowoff=$((filesize / 4)) cowsz=$((filesize / 2)) $XFS_IO_PROG -f -c "pwrite -S 0x63 -b $cowsz $cowoff $cowsz" $testdir/file3 >> $seqres.full diff --git a/tests/generic/201.out b/tests/generic/201.out index 52669d27..6867704a 100644 --- a/tests/generic/201.out +++ b/tests/generic/201.out @@ -5,4 +5,4 @@ Compare files bdbcf02ee0aa977795a79d25fcfdccb1 SCRATCH_MNT/test-201/file1 d3959a68638c50af07f0258e032cb554 SCRATCH_MNT/test-201/file3 d3959a68638c50af07f0258e032cb554 SCRATCH_MNT/test-201/file3.chk -CoW and unmount +CoW and unlink