From patchwork Fri Jun 5 21:00:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omar Sandoval X-Patchwork-Id: 6557881 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 08CFAC0020 for ; Fri, 5 Jun 2015 21:00:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6E318207B3 for ; Fri, 5 Jun 2015 21:00:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3A6EC207A2 for ; Fri, 5 Jun 2015 21:00:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751627AbbFEVAp (ORCPT ); Fri, 5 Jun 2015 17:00:45 -0400 Received: from mail-pa0-f50.google.com ([209.85.220.50]:34562 "EHLO mail-pa0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751330AbbFEVAm (ORCPT ); Fri, 5 Jun 2015 17:00:42 -0400 Received: by payr10 with SMTP id r10so57467336pay.1 for ; Fri, 05 Jun 2015 14:00:42 -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=6zCj1p936p43fCyKp9Ju7ryNDv4fXBZWRIgNbp9+otY=; b=J0b/IkFLpfOD5ibwAV+/42xBEIigpphH/x72Hby7BM1PKxVHm2cYhkD/nLVgmVlVa5 gU8Lb3sygtyS6NNwVRb/JNC0fe+oOAka17EczsGH6loimdkPL4yNOugwsa7C6ksgIMFe joE1stuXVMApcS1FEGg13dcj5GQ/gb13Ff4/ia4zrs5RLd1pbQpotdEJEkbBVY2roiU4 B8lAyfP4GBSjKZ1y6RBj5ep75MMPelkFzCQzOnlSx2vl7otfxUnkf2i5iTHwuWxzVRRJ Fl8sdfYO0lk3hMuMBvH1WRIKfVvYt8g6tP1oywYwq9TWOWd42Ll9lXhiInHA2fMI/ab7 fXrA== X-Gm-Message-State: ALoCoQnRiYbtUE8a13GonyxBSkRquHE6f3u3+KU3YqjxE8bL1/SXfujDspW+t1a7/TieUTRlWf9j X-Received: by 10.70.41.78 with SMTP id d14mr8888672pdl.35.1433538042264; Fri, 05 Jun 2015 14:00:42 -0700 (PDT) Received: from mew.dhcp4.washington.edu (D-69-91-177-144.dhcp4.washington.edu. [69.91.177.144]) by mx.google.com with ESMTPSA id j7sm7639946pdp.83.2015.06.05.14.00.40 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 05 Jun 2015 14:00:41 -0700 (PDT) From: Omar Sandoval To: fstests@vger.kernel.org Cc: linux-btrfs@vger.kernel.org, Omar Sandoval Subject: [PATCH v3] btrfs: test premature submount unmounting when deleting default subvolume Date: Fri, 5 Jun 2015 14:00:32 -0700 Message-Id: <1ebef916f54960cf6fef34be950e3d38cc3a50b0.1433537929.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. Reviewed-by: Eryu Guan Signed-off-by: Omar Sandoval Reviewed-by: Filipe Manana Tested-by: Filipe Manana --- v2->v3: - Update description (thanks, Eryu) - Remove unneeded touch v1->v2: - Simpler test: just depends on umount of the bind mount succeeding instead of running find. Without the patch applied, the bind mount will disappear so umount will fail. - Fix Eryu's comments (better subject, copyright, use _btrfs_get_subvolid) tests/btrfs/089 | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/089.out | 2 ++ tests/btrfs/group | 1 + 3 files changed, 82 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..537269824b62 --- /dev/null +++ b/tests/btrfs/089 @@ -0,0 +1,79 @@ +#! /bin/bash +# FS QA Test 089 +# +# Test deleting the default subvolume, making sure 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 Omar Sandoval. 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" >>$seqres.full 2>&1 \ + || _fail "couldn't create subvol" +testvol_id=$(_btrfs_get_subvolid "$SCRATCH_MNT" testvol) +$BTRFS_UTIL_PROG subvolume set-default $testvol_id "$SCRATCH_MNT" >>$seqres.full 2>&1 \ + || _fail "couldn't set default" + +# Bind-mount a directory under the default subvolume. +mkdir "$SCRATCH_MNT/testvol/testdir" +mkdir "$SCRATCH_MNT/testvol/mnt" +mount --bind "$SCRATCH_MNT/testvol/testdir" "$SCRATCH_MNT/testvol/mnt" + +# Now attempt to delete the default subvolume. +$BTRFS_UTIL_PROG subvolume delete "$SCRATCH_MNT/testvol" >>$seqres.full 2>&1 + +# Unmount the bind mount, which should still be alive. +$UMOUNT_PROG "$SCRATCH_MNT/testvol/mnt" + +echo "Silence is golden" +status=0 +exit diff --git a/tests/btrfs/089.out b/tests/btrfs/089.out new file mode 100644 index 000000000000..a7fcdee9b767 --- /dev/null +++ b/tests/btrfs/089.out @@ -0,0 +1,2 @@ +QA output created by 089 +Silence is golden 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