From patchwork Thu Mar 24 20:24:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 12791027 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5C95AC433EF for ; Thu, 24 Mar 2022 20:24:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236500AbiCXU0L (ORCPT ); Thu, 24 Mar 2022 16:26:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48500 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353376AbiCXU0K (ORCPT ); Thu, 24 Mar 2022 16:26:10 -0400 Received: from mail-qt1-x836.google.com (mail-qt1-x836.google.com [IPv6:2607:f8b0:4864:20::836]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A088DB7C7E for ; Thu, 24 Mar 2022 13:24:38 -0700 (PDT) Received: by mail-qt1-x836.google.com with SMTP id j21so4943154qta.0 for ; Thu, 24 Mar 2022 13:24:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toxicpanda-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=0ROhuF/DBDDJeFGZ3bLA5tk3lQSNbzKO1boaIqC2drI=; b=abK/wTL7VA6cxfPk4bMGuN4XxMLr43lLxoM6dDw1oilQBRyk1iYTFHiV0KZuTJbhOs nCc0g7DxbqjlzLXt1Kcvzf3K8Tk8IkP2wMPf6VrooDkWHctvWx/++A75wB+jvKLsjdXj Cbbm+ejQ9SwZx6RleqEDKoWfKoV/qeSCTj11XO2mE5ZVIpiPDPr0HDH8zgbMRvU4DQ6A Em5arvm1NX92WqXcKUicjx1L5HYsKc2h19eAwrEQ8BTjJS4GvrO+9XAIg7eRbCFgfveo FNX/TCpadPovGEV2SVGW+MQ3J2aHWicNG9pt+XQkrSm+bMKsY5woVi8x/ejkBoCfwHL4 8dTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0ROhuF/DBDDJeFGZ3bLA5tk3lQSNbzKO1boaIqC2drI=; b=vcMDv0vzZW+8XAhDn7r+9r93Q54Sq0JsZH9t1xnHDll2OjOPBfG/+KlLuuAbXMaeaS heOOY23lVP9+d69/N06zxt/RDBldcdqYIPTgF8UkDqHtR68FoC7Bn8ZXeXYi8LXOlzdX EbndSG6rlJ0bKhIc1/5CXi/Kne//iJvQuEqKvKYg7PWjaW4MjjqoVTMPHC7d4it07IIG MsGwWXXMPMPkGi71R4RCX/CskBJDEv31J4qFBnmgWuVhlhz41XIj9+JooFIqlFLYDmp5 D3aDBNPp+BuvcZciKytURRFOdiKFv4BcH43V2koUG77I4MVob2TP7Gx2q19ZIwtS5NMp sy2g== X-Gm-Message-State: AOAM530H3y3hauH8RXnlG25tF45CCpTU/ZI0j4ZnvFHPKnnR1QYjQhY7 EqGO4P3Rq4a9TJXvNt7YkwyG8w== X-Google-Smtp-Source: ABdhPJwRBt8CYjpkvIguaC47NsWis0oxOHKUBY/10fiaDu1oMmNvF8ql8ywO4MHiqYk7+j5Wsh232Q== X-Received: by 2002:ac8:5a50:0:b0:2e2:31ab:7303 with SMTP id o16-20020ac85a50000000b002e231ab7303mr6270702qta.66.1648153477686; Thu, 24 Mar 2022 13:24:37 -0700 (PDT) Received: from localhost (cpe-174-109-172-136.nc.res.rr.com. [174.109.172.136]) by smtp.gmail.com with ESMTPSA id bs10-20020a05620a470a00b00680ae2f3decsm569265qkb.8.2022.03.24.13.24.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Mar 2022 13:24:37 -0700 (PDT) From: Josef Bacik To: linux-btrfs@vger.kernel.org, fstests@vger.kernel.org Subject: [PATCH 2/3] fstests: generic/374: validate cross-vfsmount dedupe Date: Thu, 24 Mar 2022 16:24:33 -0400 Message-Id: X-Mailer: git-send-email 2.26.3 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org We allow for cross-vfsmount dedupes now, change this test to validate dedupe works properly cross-vfsmount. Signed-off-by: Josef Bacik Reviewed-by: Dave Chinner --- tests/generic/374 | 5 +++-- tests/generic/374.out | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/generic/374 b/tests/generic/374 index d9f33bc3..f66d1397 100755 --- a/tests/generic/374 +++ b/tests/generic/374 @@ -4,7 +4,7 @@ # # FS QA Test No. 374 # -# Check that cross-mountpoint dedupe doesn't work. +# Check that cross-mountpoint dedupe works # . ./common/preamble _begin_fstest auto quick clone dedupe @@ -50,7 +50,8 @@ _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 2>&1 | _filter_dedupe_error +_dedupe_range $testdir/file 0 $othertestdir/otherfile 0 $sz 2>&1 \ + | _filter_xfs_io filter_md5() { diff --git a/tests/generic/374.out b/tests/generic/374.out index 3243ad3d..b62c64b4 100644 --- a/tests/generic/374.out +++ b/tests/generic/374.out @@ -3,7 +3,8 @@ Format and mount Mount otherdir Create file Dedupe one file to another -XFS_IOC_FILE_EXTENT_SAME: Invalid cross-device link +deduped 65536/65536 bytes at offset 0 +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) Check output 2d61aa54b58c2e94403fb092c3dbc027 SCRATCH_MNT/test-374/file 2d61aa54b58c2e94403fb092c3dbc027 OTHER_DIR/test-374/otherfile