From patchwork Fri Dec 4 05:37:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naohiro Aota X-Patchwork-Id: 7765931 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 3994ABEEE1 for ; Fri, 4 Dec 2015 08:17:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6B08B2044B for ; Fri, 4 Dec 2015 08:17:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 335A320437 for ; Fri, 4 Dec 2015 08:17:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755370AbbLDIRL (ORCPT ); Fri, 4 Dec 2015 03:17:11 -0500 Received: from mail-pf0-f175.google.com ([209.85.192.175]:34779 "EHLO mail-pf0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752542AbbLDIRK (ORCPT ); Fri, 4 Dec 2015 03:17:10 -0500 Received: by pfbg73 with SMTP id g73so23333627pfb.1 for ; Fri, 04 Dec 2015 00:17:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=8c9XjATZGAnDQHQaM4+00YYA7ynzOsITkb6YaA0pZBM=; b=R4Z9S+jpUEq+fPREtzNgyyxV1KfhKmX875wCKE4Li0gaEWGnbwTuCb7Gf2doVhamSX TdzHKo9bgCE1MjHfIndW++yMRu/lAn3Ru7/2nCaXjnmD5BZ3REK+Isn9zmzsN10vKgpP KG9OrV3RyGgPzHTJXm2D7nwwQsRKaA2WOg7mE9vlEj3HeVvDXRjVnRnw0vZHbjZqzPr8 pv9RVoVmYUHNKsUYwKnpRDe+Dgb18D3tCgEtq/uY5Gq4DM0PMiG0mMeh0aOgJLFkgm+S rc282O5XX2yR3rEi0+DGJPiSPt9SuriGxJFBhkdwZs9ca9SnAMFjVOqYPWqZ9ifgeknw WXbw== X-Received: by 10.98.89.196 with SMTP id k65mr19726500pfj.12.1449216654100; Fri, 04 Dec 2015 00:10:54 -0800 (PST) Received: from me (sslab-relay.ics.keio.ac.jp. [131.113.126.173]) by smtp.gmail.com with ESMTPSA id qn5sm15263262pac.41.2015.12.04.00.10.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Dec 2015 00:10:53 -0800 (PST) Received: (nullmailer pid 1500 invoked by uid 1000); Fri, 04 Dec 2015 05:37:37 -0000 From: Naohiro Aota To: linux-btrfs@vger.kernel.org Cc: quwenruo@cn.fujitsu.com, Naohiro Aota Subject: [PATCH 1/3] btrfs-progs: test: umount if confirmation failed Date: Fri, 4 Dec 2015 14:37:25 +0900 Message-Id: <1449207447-1203-2-git-send-email-naota@elisp.net> X-Mailer: git-send-email 2.6.3 In-Reply-To: <1449207447-1203-1-git-send-email-naota@elisp.net> References: <1449207447-1203-1-git-send-email-naota@elisp.net> 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.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,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 When a check in check_inode() failed, the test should umount test target file system. This commit add clean up umount line in failure path. Signed-off-by: Naohiro Aota --- tests/fsck-tests/012-leaf-corruption/test.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/fsck-tests/012-leaf-corruption/test.sh b/tests/fsck-tests/012-leaf-corruption/test.sh index 6e23145..bfdd0ea 100755 --- a/tests/fsck-tests/012-leaf-corruption/test.sh +++ b/tests/fsck-tests/012-leaf-corruption/test.sh @@ -57,6 +57,7 @@ check_inode() # Check whether the inode exists exists=$($SUDO_HELPER find $path -inum $ino) if [ -z "$exists" ]; then + $SUDO_HELPER umount $TEST_MNT _fail "inode $ino not recovered correctly" fi @@ -64,17 +65,20 @@ check_inode() found_mode=$(printf "%o" 0x$($SUDO_HELPER stat $exists -c %f)) if [ $found_mode -ne $mode ]; then echo "$found_mode" + $SUDO_HELPER umount $TEST_MNT _fail "inode $ino modes not recovered" fi # Check inode size found_size=$($SUDO_HELPER stat $exists -c %s) if [ $mode -ne 41700 -a $found_size -ne $size ]; then + $SUDO_HELPER umount $TEST_MNT _fail "inode $ino size not recovered correctly" fi # Check inode name if [ "$(basename $exists)" != "$name" ]; then + $SUDO_HELPER umount $TEST_MNT _fail "inode $ino name not recovered correctly" else return 0