From patchwork Thu Dec 19 14:28:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 11303743 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 025F5138D for ; Thu, 19 Dec 2019 14:28:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D2C6624672 for ; Thu, 19 Dec 2019 14:28:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=toxicpanda-com.20150623.gappssmtp.com header.i=@toxicpanda-com.20150623.gappssmtp.com header.b="sPzbSWgM" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726873AbfLSO2i (ORCPT ); Thu, 19 Dec 2019 09:28:38 -0500 Received: from mail-qk1-f193.google.com ([209.85.222.193]:41016 "EHLO mail-qk1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726744AbfLSO2i (ORCPT ); Thu, 19 Dec 2019 09:28:38 -0500 Received: by mail-qk1-f193.google.com with SMTP id x129so4750431qke.8 for ; Thu, 19 Dec 2019 06:28:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toxicpanda-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=EvqY5TvLs2EG4Ubsh3PQ2JzrxSkMhMPV6qsK0WJpGKw=; b=sPzbSWgMnZcCv3QxfuwTEh8TQ0G0wtRC7QspVh3RgKDukoy+ILoAunU8r2lKSsESoX JQWDUs/wIFL3hOLb0thCbGEJCWt67nq04wNi3LipsC7DcVXnj2tahqkcwMxtsrSHYTpv tjyzvVQBuyBjT9c2WGAIzer5Nx3snHdA8LMWDeha6HP+4ymp69ByT86iGc9S0gySdhu9 t08urhD7JsMUwnXNZbFV0w7aOOB/BToODPnWKqfaMYgYa85JqOghpRtvbIeidnYN4Tu0 TDxE6TkVjF8BMoJq7puMh1+kpoBWeHDdDDu/CsSjI8REtfnbuIxIvzFQTSn0LxpwR+wH B1QQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=EvqY5TvLs2EG4Ubsh3PQ2JzrxSkMhMPV6qsK0WJpGKw=; b=nsiRkxnZ+QCTCNA9MtnjJnTS7vO7HBlDpK9j6TBefx9gnrJv4Ui6eGCSJRc/nQHN8r GH2a0jeabpwAfTacUn2w22xRzl+cufBg5upLCq7bTdezC1UtDwQWC+cTX4SZLot+webI OlMOTUkX/hFsGRgs4iDdNcD+RNQsLrMHvU7FCJaj6/Dc4WjhNUstztPtDgl69l0TL5cU vXY84J3ga1mRyVcq2btw3JFZ50Ru9LpUblvlEjkr2nPT6HB23LvkYUq8xmJrD6dGbuLg AMfeREdkzn/3n8gfbBk2cm+tZJZob0LMLdFhjxa62WBMl8M3NcSGd36rsDlG3v5OSSY+ z14Q== X-Gm-Message-State: APjAAAVBjssKZsdAVUkdQRX0n0/bZde9lVgUf0grpgnVIWKHvkEI9LuO vYfiQw6E+YBQmNjFAZgYiwDzeQ== X-Google-Smtp-Source: APXvYqz1jDbORjr+hxhQaQ9oa2hWthuxh6OPG3MhHEHOlu6PCBIdzBqsfsFe9ZOvj/EUY54beGULUQ== X-Received: by 2002:ae9:e30b:: with SMTP id v11mr8551777qkf.434.1576765717461; Thu, 19 Dec 2019 06:28:37 -0800 (PST) Received: from localhost ([107.15.81.208]) by smtp.gmail.com with ESMTPSA id q73sm1750009qka.56.2019.12.19.06.28.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2019 06:28:36 -0800 (PST) From: Josef Bacik To: linux-btrfs@vger.kernel.org, fstests@vger.kernel.org, kernel-team@fb.com Subject: [PATCH] btrfs: regression test for subvol deletion after rename Date: Thu, 19 Dec 2019 09:28:35 -0500 Message-Id: <20191219142835.50371-1-josef@toxicpanda.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org Test removal of a subvolume via rmdir after it has been renamed into a snapshot of the volume that originally contained the subvolume reference. This currently fails on btrfs but is fixed by the patch with the title "btrfs: fix invalid removal of root ref" Signed-off-by: Josef Bacik --- tests/btrfs/202 | 54 +++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/202.out | 4 ++++ tests/btrfs/group | 1 + 3 files changed, 59 insertions(+) create mode 100755 tests/btrfs/202 create mode 100644 tests/btrfs/202.out diff --git a/tests/btrfs/202 b/tests/btrfs/202 new file mode 100755 index 00000000..b02ee446 --- /dev/null +++ b/tests/btrfs/202 @@ -0,0 +1,54 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# +# FS QA Test 201 +# +# Regression test for fix "btrfs: fix invalid removal of root ref" +# +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 -f $tmp.* +} + +. ./common/rc +. ./common/filter + +rm -f $seqres.full + +_supported_fs btrfs +_supported_os Linux + +_scratch_mkfs >> $seqres.full 2>&1 +_scratch_mount + +# Create a subvol b under a and then snapshot a into c. This create's a stub +# entry in c for b because c doesn't have a reference for b. +# +# But when we rename b c/foo it creates a ref for b in c. However if we go to +# remove c/b btrfs used to depend on not finding the root ref to handle the +# unlink properly, but we now have a ref for that root. We also had a bug that +# would allow us to remove mis-matched refs if the keys matched, so we'd end up +# removing too many entries which would cause a transaction abort. + +$BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/a | _filter_scratch +$BTRFS_UTIL_PROG subvolume create $SCRATCH_MNT/a/b | _filter_scratch +$BTRFS_UTIL_PROG subvolume snapshot $SCRATCH_MNT/a $SCRATCH_MNT/c \ + | _filter_scratch +ls $SCRATCH_MNT/c/b +mkdir $SCRATCH_MNT/c/foo +mv $SCRATCH_MNT/a/b $SCRATCH_MNT/c/foo +rm -rf $SCRATCH_MNT/* +touch $SCRATCH_MNT/blah + +status=0 +exit diff --git a/tests/btrfs/202.out b/tests/btrfs/202.out new file mode 100644 index 00000000..938870cf --- /dev/null +++ b/tests/btrfs/202.out @@ -0,0 +1,4 @@ +QA output created by 201 +Create subvolume 'SCRATCH_MNT/a' +Create subvolume 'SCRATCH_MNT/a/b' +Create a snapshot of 'SCRATCH_MNT/a' in 'SCRATCH_MNT/c' diff --git a/tests/btrfs/group b/tests/btrfs/group index d7eeb45d..7abc5f07 100644 --- a/tests/btrfs/group +++ b/tests/btrfs/group @@ -204,3 +204,4 @@ 199 auto quick trim 200 auto quick send clone 201 auto quick punch log +202 auto quick volume