From patchwork Wed Jun 3 02:35:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omar Sandoval X-Patchwork-Id: 6531941 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id DC8ACC0433 for ; Wed, 3 Jun 2015 02:35:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DDE002063B for ; Wed, 3 Jun 2015 02:35:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DB71220694 for ; Wed, 3 Jun 2015 02:35:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752887AbbFCCfm (ORCPT ); Tue, 2 Jun 2015 22:35:42 -0400 Received: from mail-pa0-f48.google.com ([209.85.220.48]:34503 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752876AbbFCCfi (ORCPT ); Tue, 2 Jun 2015 22:35:38 -0400 Received: by payr10 with SMTP id r10so63307504pay.1 for ; Tue, 02 Jun 2015 19:35:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=QCvDn79awNRuUyvxRXBfqrQlz4eKKqYrYIfWezAQi2Q=; b=WZz7wiG0NkzETP9rOSxGxVL0BWIBuWB4eE1P/8A9klvxpUoG01ideeMs/BllFv5sji 9gKI7BXrW4fMkGdmnFd5QTpVEinXYG0DJopQqef+ueD4iCw0Jin8PrHlcRhl7QkoHZEd 9QjCHZopFZdlR1ct0/uQz2UOw9rCr81msMKLw/IipHpQ36Vah6Mz78qwCA/K3HW+NPR4 BSJ+Ovixxj4JNjpTwyFC5FnkD6sYEEyc3ZvQCzOCQPznBOQoMYcV3KuD74SI16BJjVOx m9zrRlmsh4B04abnWz2ww+ZVoOviiVvM1y/3BO0Ayvy/4aPpFD3lx4+PCAdMv8H5M9Vn N/cA== X-Gm-Message-State: ALoCoQlEKvbaqNXopx2kyNrbqV0HlmGonHu5Lwt/bc5ch5dmZSM5+88UtWsTKajNt6idd04+73Lq X-Received: by 10.66.160.1 with SMTP id xg1mr55238304pab.27.1433298937637; Tue, 02 Jun 2015 19:35:37 -0700 (PDT) Received: from mew.localdomain (c-76-104-211-44.hsd1.wa.comcast.net. [76.104.211.44]) by mx.google.com with ESMTPSA id d6sm16755234pdp.88.2015.06.02.19.35.36 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 02 Jun 2015 19:35:36 -0700 (PDT) From: Omar Sandoval To: fstests@vger.kernel.org Cc: linux-btrfs@vger.kernel.org, Omar Sandoval Subject: [PATCH] btrfs: default subvolume deletion test Date: Tue, 2 Jun 2015 19:35:03 -0700 Message-Id: <7bc395d36b55628462db15e4eb8ee8e772bb94c9.1433298839.git.osandov@osandov.com> X-Mailer: git-send-email 2.4.2 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add a regression test for a problem where attempting to delete the default subvolume would fail (as expected), but not until after all submounts under the subvolume were unmounted. Signed-off-by: Omar Sandoval --- tests/btrfs/089 | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/089.out | 10 +++++++ tests/btrfs/group | 1 + 3 files changed, 93 insertions(+) create mode 100755 tests/btrfs/089 create mode 100644 tests/btrfs/089.out diff --git a/tests/btrfs/089 b/tests/btrfs/089 new file mode 100755 index 000000000000..af28d996d5c6 --- /dev/null +++ b/tests/btrfs/089 @@ -0,0 +1,82 @@ +#! /bin/bash +# FS QA Test 089 +# +# Test deleting the default subvolume, making sure that it fails and that +# submounts under it are not unmounted prematurely. This is a regression test +# for Linux commit "Btrfs: don't invalidate root dentry when subvolume deletion +# fails". +# +#----------------------------------------------------------------------- +# Copyright (c) 2015 YOUR NAME HERE. 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 -f $tmp.* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter +. ./common/filter.btrfs + +# real QA test starts here + +# Modify as appropriate. +_need_to_be_root +_supported_fs btrfs +_supported_os Linux +_require_scratch + +rm -f $seqres.full + +_scratch_mkfs >>$seqres.full 2>&1 +_scratch_mount + +# Create a new subvolume and make it the default subvolume. +$BTRFS_UTIL_PROG subvolume create "$SCRATCH_MNT/testvol" | _filter_scratch +testvol_id=$($BTRFS_UTIL_PROG subvolume list "$SCRATCH_MNT/testvol" | awk '{print $2}') +$BTRFS_UTIL_PROG subvolume set-default "$testvol_id" "$SCRATCH_MNT" + +# Bind-mount a directory under the default subvolume. +mkdir "$SCRATCH_MNT/testvol/testdir" +touch "$SCRATCH_MNT/testvol/testdir/testfile" +mkdir "$SCRATCH_MNT/testvol/mnt" +mount --bind "$SCRATCH_MNT/testvol/testdir" "$SCRATCH_MNT/testvol/mnt" + +# Now attempt to delete the default subvolume, which should fail. +$BTRFS_UTIL_PROG subvolume delete "$SCRATCH_MNT/testvol" 2>&1 | _filter_btrfs_subvol_delete + +# Make sure that the subvolume and bind mount survived. +cd "$SCRATCH_MNT" +find | sort + +cd "$here" +_scratch_unmount + +status=0 +exit diff --git a/tests/btrfs/089.out b/tests/btrfs/089.out new file mode 100644 index 000000000000..eb9c5112e12e --- /dev/null +++ b/tests/btrfs/089.out @@ -0,0 +1,10 @@ +QA output created by 089 +Create subvolume 'SCRATCH_MNT/testvol' +ERROR: cannot delete 'SCRATCH_MNT/testvol' - Operation not permitted +Delete subvolume 'SCRATCH_MNT/testvol' +. +./testvol +./testvol/mnt +./testvol/mnt/testfile +./testvol/testdir +./testvol/testdir/testfile diff --git a/tests/btrfs/group b/tests/btrfs/group index ffe18bff0d21..616d060758c1 100644 --- a/tests/btrfs/group +++ b/tests/btrfs/group @@ -91,6 +91,7 @@ 086 auto quick clone 087 auto quick send 088 auto quick metadata +089 auto quick subvol 090 auto quick metadata 091 auto quick qgroup 092 auto quick send