From patchwork Sat May 5 10:31:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 10382105 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 48D6B60353 for ; Sat, 5 May 2018 10:30:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 397B429548 for ; Sat, 5 May 2018 10:30:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2CC452954B; Sat, 5 May 2018 10:30:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 889DC29548 for ; Sat, 5 May 2018 10:30:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751777AbeEEKaE (ORCPT ); Sat, 5 May 2018 06:30:04 -0400 Received: from mail-wm0-f53.google.com ([74.125.82.53]:35816 "EHLO mail-wm0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751211AbeEEKaA (ORCPT ); Sat, 5 May 2018 06:30:00 -0400 Received: by mail-wm0-f53.google.com with SMTP id o78-v6so8708763wmg.0; Sat, 05 May 2018 03:29:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=mLxFkRZc4xIdpqCitPftmPeWs8Y+YeYIOMF6Id6E9ME=; b=Ry0EpUmSWcKvF0TymTiKPRHZ2fu31139J7bySXOcpAhjG63Ag8ctiGbaNSbrwvYWCT E0iyLf+Iic29EXHEfl5tesPgPx9mxcxytHuS1tpkphWZC8y48u/6JwWGG5VoDM0iCnQ4 PkulSQuWqKkJNENEni22gkreJMy40saYR5WH8l/NVwzsvm9v7A+/uSA1+hd9C3I5n2Bi AEodH4P/hDj8Pnfo9JRTHALIkFJ6Qxyu7Moj8sGrH0gHuYg70kG6Uyt21Hj9pNsvK6oV 60x4oLL/UfMzLrYP+OINO62/D7E/U3Tb21XwAtRFTFG3tf3nFqrTqXcflmHRTZxlMeI8 +v+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=mLxFkRZc4xIdpqCitPftmPeWs8Y+YeYIOMF6Id6E9ME=; b=g8QDOnH5YmaSlKKAntyii5XHhF0xKZcyO2QdZe8qThyVrsmX2DAKAz9nVTuh3I8EeL Xb6YvOIiIAPGYvT3KxOeDCU3Qjx1uzvLFgAl0NZwBappxJsEw4m0TFOVg5QQNSkHR/+s og0SGr89ndNKgIZMDdAxMMlH2Aph3Ek3l3jdwKiq8jV3DNG7f2dP4c59AbRgrAPkdFr/ HAJ9ErG1NaquoIpjNMTQrIh2ot3ez6VUI/vOq6HEtG0DLCZUtWAAE+na5VlPmM8TgoBp dvqM5mmMvl/0p6ASPDIiWzWoIv/Ys6LCYhQydbl8Vf4Uw6f6eKwShitXiBFqgcbpdbv1 SZ8Q== X-Gm-Message-State: ALQs6tB7RlDXT7JmaZe1y4hFZ+5YXzPIZfssd/frPPjFV9Lom5KW2WwS oocHFaEMa58R5zfStClMJETHzQ== X-Google-Smtp-Source: AB8JxZqfInz0cU6vEaCIjp5PRZHf5+3C1Z1jhmOtK8jh5ayr4spu32oq5IbwOAQevwbZGTbO0OOSwg== X-Received: by 10.28.0.206 with SMTP id 197mr18115630wma.118.1525516198182; Sat, 05 May 2018 03:29:58 -0700 (PDT) Received: from localhost.localdomain ([94.230.83.122]) by smtp.gmail.com with ESMTPSA id h8-v6sm2765588wmc.16.2018.05.05.03.29.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 05 May 2018 03:29:57 -0700 (PDT) From: Amir Goldstein To: Christoph Hellwig Cc: Eryu Guan , "Darrick J . Wong" , fstests@vger.kernel.org, linux-xfs@vger.kernel.org Subject: [PATCH] xfs/132: remove duplicate test Date: Sat, 5 May 2018 13:31:22 +0300 Message-Id: <1525516282-23276-1-git-send-email-amir73il@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Test description says: "This is the same test as generic/156 except that we also check the inode reflink flag.", only since commit f1c3fee ("xfs: remove NOCOW_FL testing from test") it is almost exactly the same test as generic/156. almost - because since xfs/132 diverged from generic/156 the change 911efb0 ("reflink: change to relative margins") is only applied to the original test. Anyway, there doesn't seem to be a reason to keep this duplicated test anymore, so remove it. Signed-off-by: Amir Goldstein Reviewed-by: Darrick J. Wong --- tests/xfs/132 | 126 ------------------------------------------------------ tests/xfs/132.out | 12 ------ tests/xfs/group | 1 - 3 files changed, 139 deletions(-) delete mode 100755 tests/xfs/132 delete mode 100644 tests/xfs/132.out diff --git a/tests/xfs/132 b/tests/xfs/132 deleted file mode 100755 index 178e268..0000000 --- a/tests/xfs/132 +++ /dev/null @@ -1,126 +0,0 @@ -#! /bin/bash -# FS QA Test No. 132 -# -# Ensure that fallocate on reflinked files actually CoWs the shared blocks. -# - Record fs block usage (0) -# - Create a file and some reflink copies -# - Record fs block usage (1) -# - funshare half of one of the copies -# - Record fs block usage (2) -# - funshare all of the copies -# - Record fs block usage (3) -# - rewrite the original file -# - Record fs block usage (4) -# - Compare fs block usage of 0-4 to ensure that block usage behaves as -# we expect. -# - Compare the status of the inode reflink flag at each step. -# -# "funshare" refers to fallocate copy-on-writing the shared blocks -# -# This is the same test as generic/156 except that we also check the inode -# reflink flag. -# -#----------------------------------------------------------------------- -# Copyright (c) 2015, Oracle and/or its affiliates. All Rights Reserved. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it would be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -#----------------------------------------------------------------------- - -seq=`basename $0` -seqres=$RESULT_DIR/$seq -echo "QA output created by $seq" - -here=`pwd` -tmp=/tmp/$$ -status=1 # failure is the default! -trap "_cleanup; exit \$status" 0 1 2 3 15 - -_cleanup() -{ - cd / - rm -rf $tmp.* $testdir -} - -# get standard environment, filters and checks -. ./common/rc -. ./common/filter -. ./common/attr -. ./common/reflink - -# real QA test starts here -_supported_os Linux -_require_test_reflink -_require_test_lsattr -_require_cp_reflink -_require_xfs_io_command "funshare" - -rm -f $seqres.full - -testdir=$TEST_DIR/test-$seq -rm -rf $testdir -mkdir $testdir - -echo "Create the original file blocks" -blksz="$(_get_block_size $testdir)" -blks=2000 -margin=100 -sz=$((blksz * blks)) -free_blocks0=$(stat -f $testdir -c '%f') -nr=4 -filesize=$((blksz * nr)) -_pwrite_byte 0x61 0 $sz $testdir/file1 >> $seqres.full -_test_cycle_mount - -echo "Create the reflink copies" -for i in `seq 2 $nr`; do - _cp_reflink $testdir/file1 $testdir/file$i -done -_test_cycle_mount -free_blocks1=$(stat -f $testdir -c '%f') - -echo "funshare part of a file" -$XFS_IO_PROG -f -c "funshare 0 $((sz / 2))" $testdir/file2 -_test_cycle_mount - -echo "funshare some of the copies" -$XFS_IO_PROG -f -c "funshare 0 $sz" $testdir/file2 -$XFS_IO_PROG -f -c "funshare 0 $sz" $testdir/file3 -_test_cycle_mount -free_blocks2=$(stat -f $testdir -c '%f') - -echo "funshare the rest of the files" -$XFS_IO_PROG -f -c "funshare 0 $sz" $testdir/file4 -$XFS_IO_PROG -f -c "funshare 0 $sz" $testdir/file1 -_test_cycle_mount -free_blocks3=$(stat -f $testdir -c '%f') - -echo "Rewrite the original file" -_pwrite_byte 0x65 0 $sz $testdir/file1 >> $seqres.full -_test_cycle_mount -free_blocks4=$(stat -f $testdir -c '%f') -#echo $free_blocks0 $free_blocks1 $free_blocks2 $free_blocks3 $free_blocks4 - -_within_tolerance "free blocks after reflinking" $free_blocks1 $((free_blocks0 - blks)) $margin -v - -_within_tolerance "free blocks after nocow'ing some copies" $free_blocks2 $((free_blocks1 - (2 * blks))) $margin -v - -_within_tolerance "free blocks after nocow'ing all copies" $free_blocks3 $((free_blocks2 - blks)) $margin -v - -_within_tolerance "free blocks after overwriting original" $free_blocks4 $free_blocks3 $margin -v - -_within_tolerance "free blocks after all tests" $free_blocks4 $((free_blocks0 - (4 * blks))) $margin -v - -# success, all done -status=0 -exit diff --git a/tests/xfs/132.out b/tests/xfs/132.out deleted file mode 100644 index 3d1281c..0000000 --- a/tests/xfs/132.out +++ /dev/null @@ -1,12 +0,0 @@ -QA output created by 132 -Create the original file blocks -Create the reflink copies -funshare part of a file -funshare some of the copies -funshare the rest of the files -Rewrite the original file -free blocks after reflinking is in range -free blocks after nocow'ing some copies is in range -free blocks after nocow'ing all copies is in range -free blocks after overwriting original is in range -free blocks after all tests is in range diff --git a/tests/xfs/group b/tests/xfs/group index 39e259e..32bf4f7 100644 --- a/tests/xfs/group +++ b/tests/xfs/group @@ -129,7 +129,6 @@ 129 auto quick clone 130 fuzzers clone 131 auto quick clone -132 auto quick clone 133 dangerous_fuzzers 134 dangerous_fuzzers 135 auto logprint quick v2log