From patchwork Tue Oct 20 11:34:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Bo X-Patchwork-Id: 7446131 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A8CC59F302 for ; Tue, 20 Oct 2015 11:34:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C859C2088E for ; Tue, 20 Oct 2015 11:34:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DD5ED2088B for ; Tue, 20 Oct 2015 11:34:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751618AbbJTLeR (ORCPT ); Tue, 20 Oct 2015 07:34:17 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:34505 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751071AbbJTLeQ (ORCPT ); Tue, 20 Oct 2015 07:34:16 -0400 Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id t9KBYFeE020740 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 20 Oct 2015 11:34:16 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by aserv0021.oracle.com (8.13.8/8.13.8) with ESMTP id t9KBYFP4011476 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Tue, 20 Oct 2015 11:34:15 GMT Received: from abhmp0014.oracle.com (abhmp0014.oracle.com [141.146.116.20]) by userv0121.oracle.com (8.13.8/8.13.8) with ESMTP id t9KBYFk4007474; Tue, 20 Oct 2015 11:34:15 GMT Received: from localhost.jp.oracle.com (/10.191.0.29) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 20 Oct 2015 04:34:14 -0700 From: Liu Bo To: fstests@vger.kernel.org Cc: linux-btrfs@vger.kernel.org Subject: [PATCH] xfstests: btrfs/012: add a regression test for deleting ext2_saved Date: Tue, 20 Oct 2015 19:34:06 +0800 Message-Id: <1445340846-9774-1-git-send-email-bo.li.liu@oracle.com> X-Mailer: git-send-email 2.1.0 X-Source-IP: aserv0021.oracle.com [141.146.126.233] 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, 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 Btrfs now has changed to delete subvolume/snapshot asynchronously, which means that after umount, if we've already deleted 'ext2_saved', rollback can still be completed, which should not. So this adds a regression test for this. Signed-off-by: Liu Bo Reviewed-by: Eryu Guan --- tests/btrfs/012 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tests/btrfs/012 b/tests/btrfs/012 index d513759..b39dec0 100755 --- a/tests/btrfs/012 +++ b/tests/btrfs/012 @@ -112,6 +112,18 @@ diff -r /lib/modules/`uname -r`/ $SCRATCH_MNT/`uname -r`/ 2>&1 | grep -vw "sourc _scratch_unmount +# Convert it to btrfs, mount it and delete "ext2_saved" +$BTRFS_CONVERT_PROG $SCRATCH_DEV >> $seqres.full 2>&1 || \ + _fail "btrfs-convert failed" +_scratch_mount || _fail "Could not mount new btrfs fs" +$BTRFS_UTIL_PROG subvolume delete $SCRATCH_MNT/ext2_saved >> $seqres.full 2>&1 || + _fail "failed to delete ext2_saved subvolume" +_scratch_unmount + +# Now restore the ext4 device, expecting a failure +$BTRFS_CONVERT_PROG -r $SCRATCH_DEV >> $seqres.full 2>&1 +[ $? -eq 1 ] || _fail "Failure is expected, but btrfs-convert returns with rollback complete" + # success, all done status=0 exit