From patchwork Wed Aug 14 20:07:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 2844772 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7A1E0BF546 for ; Wed, 14 Aug 2013 20:08:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 44EBB206E0 for ; Wed, 14 Aug 2013 20:08:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 379C0206E3 for ; Wed, 14 Aug 2013 20:07:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933156Ab3HNUH5 (ORCPT ); Wed, 14 Aug 2013 16:07:57 -0400 Received: from dkim2.fusionio.com ([66.114.96.54]:33929 "EHLO dkim2.fusionio.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933022Ab3HNUHz (ORCPT ); Wed, 14 Aug 2013 16:07:55 -0400 Received: from mx2.fusionio.com (unknown [10.101.1.160]) by dkim2.fusionio.com (Postfix) with ESMTP id 832929A0691 for ; Wed, 14 Aug 2013 14:07:55 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fusionio.com; s=default; t=1376510875; bh=1ckena2tuURNqfMePDfWQ/SpCHy2s96SvmGLAR0Ve/o=; h=From:To:Subject:Date; b=qUO/ILPuHe5ZL1nPhXoGo3cmHOWPQ//vhZu5JY0mj73r682FeuYHPCw3KgbmZFL86 FjPi6+i4ogUyKz6jVOr86qwNenPDSpYT3kGofTHhqzD7ScmPU1lidP0rY1b8uuvkqB aBBbBgBiaPDxl1284cVm2QmnLVf8ioBX0SKkG23s= X-ASG-Debug-ID: 1376510874-0421b5021f274150001-6jHSXT Received: from CAS1.int.fusionio.com (cas1.int.fusionio.com [10.101.1.40]) by mx2.fusionio.com with ESMTP id hDOlMcRHQAFLyk2O (version=TLSv1 cipher=AES128-SHA bits=128 verify=NO); Wed, 14 Aug 2013 14:07:54 -0600 (MDT) X-Barracuda-Envelope-From: JBacik@fusionio.com Received: from localhost (10.101.1.160) by mail.fusionio.com (10.101.1.40) with Microsoft SMTP Server (TLS) id 14.3.123.3; Wed, 14 Aug 2013 14:07:53 -0600 From: Josef Bacik To: , Subject: [PATCH] xfstests: btrfs/003: regression test for subvol delete V3 Date: Wed, 14 Aug 2013 16:07:52 -0400 X-ASG-Orig-Subj: [PATCH] xfstests: btrfs/003: regression test for subvol delete V3 Message-ID: <1376510872-9951-1-git-send-email-jbacik@fusionio.com> X-Mailer: git-send-email 1.7.7.6 MIME-Version: 1.0 X-Originating-IP: [10.101.1.160] X-Barracuda-Connect: cas1.int.fusionio.com[10.101.1.40] X-Barracuda-Start-Time: 1376510874 X-Barracuda-Encrypted: AES128-SHA X-Barracuda-URL: http://10.101.1.181:8000/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at fusionio.com X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using global scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=9.0 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.138395 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham 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 We were allowing users to delete their default subvolume, which is problematic. This test is a regression test to make sure we don't let that happen in the future. Thanks, Signed-off-by: Josef Bacik Reviewed-by: Eric Sandeen --- V2->V3: remove comment and abstract out the subvolid logic as per Eric's suggestions V1->V2: address the comments made by Eric Sandeen. common/rc | 8 ++++++ tests/btrfs/003 | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/003.out | 2 + tests/btrfs/group | 1 + 4 files changed, 74 insertions(+), 0 deletions(-) create mode 100755 tests/btrfs/003 create mode 100644 tests/btrfs/003.out diff --git a/common/rc b/common/rc index 4de1329..9f4ea58 100644 --- a/common/rc +++ b/common/rc @@ -57,6 +57,14 @@ dd() fi } +_btrfs_get_subvolid() +{ + mnt=$1 + name=$2 + + $BTRFS_UTIL_PROG sub list $mnt | grep $name | awk '{ print $2 }' +} + # Prints the md5 checksum of a given file _md5_checksum() { diff --git a/tests/btrfs/003 b/tests/btrfs/003 new file mode 100755 index 0000000..5cd89e9 --- /dev/null +++ b/tests/btrfs/003 @@ -0,0 +1,63 @@ +#! /bin/bash +# FS QA Test No. btrfs/003 +# +# Regression test to make sure we can't delete the default subvol +# +#----------------------------------------------------------------------- +# Copyright (c) 2013 Fusion IO. 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! + +_cleanup() +{ + rm -f $tmp.* +} + +trap "_cleanup ; exit \$status" 0 1 2 3 15 + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter + +# real QA test starts here +_supported_fs btrfs +_supported_os Linux +_require_scratch + +_scratch_mkfs > /dev/null 2>&1 +_scratch_mount + +$BTRFS_UTIL_PROG sub create $SCRATCH_MNT/newvol >> $seqres.full 2>&1 \ + || _fail "couldn't create subvol" +subvolid=$(_btrfs_get_subvolid $SCRATCH_MNT newvol) +$BTRFS_UTIL_PROG sub set-default $subvolid $SCRATCH_MNT >> $seqres.full 2>&1 \ + || _fail "couldn't set default" +$BTRFS_UTIL_PROG sub delete $SCRATCH_MNT/newvol >> $seqres.full 2>&1 +_scratch_unmount +_scratch_mount || _fail "mount should have succeeded" + +echo "Silence is golden" +status=0 ; exit diff --git a/tests/btrfs/003.out b/tests/btrfs/003.out new file mode 100644 index 0000000..6895fc8 --- /dev/null +++ b/tests/btrfs/003.out @@ -0,0 +1,2 @@ +QA output created by 003 +Silence is golden diff --git a/tests/btrfs/group b/tests/btrfs/group index 5b65068..86f5a5a 100644 --- a/tests/btrfs/group +++ b/tests/btrfs/group @@ -5,6 +5,7 @@ # 001 auto quick 002 auto quick +003 auto quick 254 auto quick 264 auto 265 auto