From patchwork Fri Jun 17 01:47:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 9182337 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 6F33B60573 for ; Fri, 17 Jun 2016 01:48:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 614EC283A1 for ; Fri, 17 Jun 2016 01:48:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 56B69283A9; Fri, 17 Jun 2016 01:48:03 +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=-6.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY 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 BBA0F283A1 for ; Fri, 17 Jun 2016 01:48:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932330AbcFQBr5 (ORCPT ); Thu, 16 Jun 2016 21:47:57 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:18585 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755253AbcFQBrz (ORCPT ); Thu, 16 Jun 2016 21:47:55 -0400 Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u5H1llnd015024 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 17 Jun 2016 01:47:48 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by userv0022.oracle.com (8.14.4/8.13.8) with ESMTP id u5H1llqO015255 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 17 Jun 2016 01:47:47 GMT Received: from abhmp0018.oracle.com (abhmp0018.oracle.com [141.146.116.24]) by aserv0122.oracle.com (8.13.8/8.13.8) with ESMTP id u5H1liuE014733; Fri, 17 Jun 2016 01:47:45 GMT Received: from localhost (/10.145.178.207) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 16 Jun 2016 18:47:44 -0700 Subject: [PATCH 16/20] reflink: test cross-mountpoint reflink and dedupe From: "Darrick J. Wong" To: david@fromorbit.com, darrick.wong@oracle.com Cc: linux-btrfs@vger.kernel.org, fstests@vger.kernel.org, xfs@oss.sgi.com Date: Thu, 16 Jun 2016 18:47:42 -0700 Message-ID: <146612806287.25024.6626531953151914169.stgit@birch.djwong.org> In-Reply-To: <146612796204.25024.18254357523133394284.stgit@birch.djwong.org> References: <146612796204.25024.18254357523133394284.stgit@birch.djwong.org> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Source-IP: userv0022.oracle.com [156.151.31.74] Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Test sharing blocks via reflink and dedupe between two different mountpoints of the same filesystem. This shouldn't work, since we don't allow cross-mountpoint functions. Signed-off-by: Darrick J. Wong --- common/reflink | 2 + tests/generic/927 | 88 +++++++++++++++++++++++++++++++++++++++++++++++++ tests/generic/927.out | 9 +++++ tests/generic/928 | 86 ++++++++++++++++++++++++++++++++++++++++++++++++ tests/generic/928.out | 10 ++++++ tests/generic/group | 2 + 6 files changed, 196 insertions(+), 1 deletion(-) create mode 100755 tests/generic/927 create mode 100644 tests/generic/927.out create mode 100755 tests/generic/928 create mode 100644 tests/generic/928.out -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/common/reflink b/common/reflink index 4ec390d..1363971 100644 --- a/common/reflink +++ b/common/reflink @@ -107,7 +107,7 @@ _require_scratch_dedupe() _scratch_mount "$XFS_IO_PROG" -f -c "pwrite -S 0x61 0 65536" "$SCRATCH_MNT/file1" > /dev/null "$XFS_IO_PROG" -f -c "pwrite -S 0x61 0 65536" "$SCRATCH_MNT/file2" > /dev/null - testio="$("$XFS_IO_PROG" -f -c "dedupe $TEST_DIR/file1 0 0 65536" "$TEST_DIR/file2" 2>&1)" + testio="$("$XFS_IO_PROG" -f -c "dedupe $SCRATCH_MNT/file1 0 0 65536" "$SCRATCH_MNT/file2" 2>&1)" echo $testio | grep -q "Operation not supported" && \ _notrun "Dedupe not supported by test filesystem type: $FSTYP" echo $testio | grep -q "Inappropriate ioctl for device" && \ diff --git a/tests/generic/927 b/tests/generic/927 new file mode 100755 index 0000000..e1c30bd --- /dev/null +++ b/tests/generic/927 @@ -0,0 +1,88 @@ +#! /bin/bash +# FS QA Test No. 927 +# +# Check that cross-mountpoint reflink doesn't work. +# +#----------------------------------------------------------------------- +# Copyright (c) 2016 Oracle, Inc. 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 7 15 + +_cleanup() +{ + cd / + rm -rf $tmp.* + wait +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter +. ./common/reflink + +# real QA test starts here +_supported_os Linux +_require_scratch_reflink +_require_cp_reflink + +echo "Format and mount" +_scratch_mkfs > $seqres.full 2>&1 +_scratch_mount >> $seqres.full 2>&1 + +testdir=$SCRATCH_MNT/test-$seq +mkdir $testdir +otherdir=/tmp/m.$seq +othertestdir=$otherdir/test-$seq +rm -rf $otherdir +mkdir $otherdir + +blocks=1 +blksz=65536 +sz=$((blksz * blocks)) + +echo "Mount otherdir" +SCRATCH_MNT=$otherdir _scratch_mount + +echo "Create file" +_pwrite_byte 0x61 0 $sz $testdir/file >> $seqres.full + +filter_md5() { + _filter_scratch | sed -e "s,$otherdir,OTHER_DIR,g" +} + +echo "Reflink one file to another" +_cp_reflink $testdir/file $othertestdir/otherfiles 2>&1 | filter_md5 + +echo "Check output" +md5sum $testdir/file | _filter_scratch +test -e $othertestdir/otherfile && echo "otherfile should not exist" + +echo "Unmount otherdir" +umount $otherdir +rm -rf $otherdir + +# success, all done +status=0 +exit diff --git a/tests/generic/927.out b/tests/generic/927.out new file mode 100644 index 0000000..3ef3057 --- /dev/null +++ b/tests/generic/927.out @@ -0,0 +1,9 @@ +QA output created by 927 +Format and mount +Mount otherdir +Create file +Reflink one file to another +cp: failed to clone 'OTHER_DIR/test-927/otherfiles' from 'SCRATCH_MNT/test-927/file': Invalid cross-device link +Check output +2d61aa54b58c2e94403fb092c3dbc027 SCRATCH_MNT/test-927/file +Unmount otherdir diff --git a/tests/generic/928 b/tests/generic/928 new file mode 100755 index 0000000..050f34b --- /dev/null +++ b/tests/generic/928 @@ -0,0 +1,86 @@ +#! /bin/bash +# FS QA Test No. 928 +# +# Check that cross-mountpoint dedupe doesn't work. +# +#----------------------------------------------------------------------- +# Copyright (c) 2016 Oracle, Inc. 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 7 15 + +_cleanup() +{ + cd / + rm -rf $tmp.* + wait +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter +. ./common/reflink + +# real QA test starts here +_supported_os Linux +_require_scratch_dedupe + +echo "Format and mount" +_scratch_mkfs > $seqres.full 2>&1 +_scratch_mount >> $seqres.full 2>&1 + +testdir=$SCRATCH_MNT/test-$seq +mkdir $testdir +otherdir=/tmp/m.$seq +othertestdir=$otherdir/test-$seq +rm -rf $otherdir +mkdir $otherdir + +blocks=1 +blksz=65536 +sz=$((blocks * blksz)) + +echo "Mount otherdir" +SCRATCH_MNT=$otherdir _scratch_mount + +echo "Create file" +_pwrite_byte 0x61 0 $sz $testdir/file >> $seqres.full +_pwrite_byte 0x61 0 $sz $testdir/otherfile >> $seqres.full + +echo "Dedupe one file to another" +_dedupe_range $testdir/file 0 $othertestdir/otherfile 0 $sz >> $seqres.full + +filter_md5() { + _filter_scratch | sed -e "s,$otherdir,OTHER_DIR,g" +} +echo "Check output" +md5sum $testdir/file $othertestdir/otherfile | filter_md5 + +echo "Unmount otherdir" +umount $otherdir +rm -rf $otherdir + +# success, all done +status=0 +exit diff --git a/tests/generic/928.out b/tests/generic/928.out new file mode 100644 index 0000000..ef35c5b --- /dev/null +++ b/tests/generic/928.out @@ -0,0 +1,10 @@ +QA output created by 928 +Format and mount +Mount otherdir +Create file +Dedupe one file to another +dedupe: Invalid cross-device link +Check output +2d61aa54b58c2e94403fb092c3dbc027 SCRATCH_MNT/test-928/file +2d61aa54b58c2e94403fb092c3dbc027 OTHER_DIR/test-928/otherfile +Unmount otherdir diff --git a/tests/generic/group b/tests/generic/group index 2bd40a1..3286b0f 100644 --- a/tests/generic/group +++ b/tests/generic/group @@ -358,3 +358,5 @@ 924 auto quick clone 925 auto quick clone 926 auto quick clone +927 auto quick clone +928 auto quick clone dedupe