From patchwork Wed Jul 12 20:05:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Buchbinder X-Patchwork-Id: 9837349 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9C2F260393 for ; Wed, 12 Jul 2017 20:05:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8E8B42868D for ; Wed, 12 Jul 2017 20:05:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 81FE0286AC; Wed, 12 Jul 2017 20:05:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9FA07286AA for ; Wed, 12 Jul 2017 20:05:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752137AbdGLUFd (ORCPT ); Wed, 12 Jul 2017 16:05:33 -0400 Received: from mail-pg0-f43.google.com ([74.125.83.43]:34373 "EHLO mail-pg0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751161AbdGLUFc (ORCPT ); Wed, 12 Jul 2017 16:05:32 -0400 Received: by mail-pg0-f43.google.com with SMTP id t186so18135914pgb.1 for ; Wed, 12 Jul 2017 13:05:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=byHHA2ipqYeyRdPkVdzoA51KLr9HOk1mMCPp2ZJgHsI=; b=YDuWJtWYVPj5fPmoErYvRUbgtTIPJN9Oignp0+QuJc3in/sG6P80cRSujTRvowQzk9 r8dbjjMdcyqtjUORsnyiIet9tMRQP+UzrlVIUZ7/oHd5Azh/4cBX3C15KRac6wwjGGeK 09CUXrDmrhnh0kqaE3hftY7s3koOWhEjPoR6Y96boaf8Wc+25ESX4WmyqZJesgPrhWc6 /QZ0qO81Z4aWoz2AgdFO4u430cYRqFEXjWfgVn4f000EWF+wYyxSNQbbze4N68ig4vhu 5DaEFzpZJ6qw5ciAM7Xch4JCV1eCqp74H+mriGlBpDq6+tCiuMdIrjxNtU4csJJqRA1g tSxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=byHHA2ipqYeyRdPkVdzoA51KLr9HOk1mMCPp2ZJgHsI=; b=pAzRWJD3x1sO0kGTdUOjiLDWetsQGurwBnwauSDjNMwahpM8NajV+9c4ac1EorWV+I cXKj1EAZ2GsETQ0biH+PpcuTYxmtp2zWld9vSFue0pLUDjrxgbJj5E99O6jWzt58fzFh e6M/qLranOqp2AKXHyyno0Ng1qX+RAW1xnhVbMWpb0yE1JMCcgf5Exitiy+KshZ0tBNB JcCmw+WpyxvOnCaBv+Z0e92to8HG1XDTTEmiFCA12Mj7DsWh9K05sB2CwVKJp9zyhMdr 8sgkRgrxrkU5KeeXTK7xyRuHXkFwvxxqQIVow42+jGG6yKNQ3aK+3OYtO/3qwxF5oYJ5 2xtA== X-Gm-Message-State: AIVw113/7WGj4DEh0iU8qc00hF8BNK4dc0jQ+WUeG7WUJ9ry6Lahoqvj ifIqG1smQ2kjaR/gqh3+AQ== X-Received: by 10.98.158.139 with SMTP id f11mr57012418pfk.208.1499889931769; Wed, 12 Jul 2017 13:05:31 -0700 (PDT) Received: from abuchbinder-glaptop.corp.google.com (c-73-223-36-121.hsd1.ca.comcast.net. [73.223.36.121]) by smtp.gmail.com with ESMTPSA id 191sm6614326pfb.70.2017.07.12.13.05.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 12 Jul 2017 13:05:31 -0700 (PDT) From: Adam Buchbinder To: linux-btrfs@vger.kernel.org Cc: Adam Buchbinder Subject: [PATCH] btrfs-progs: Use '-t btrfs' mount option in tests. Date: Wed, 12 Jul 2017 13:05:22 -0700 Message-Id: <20170712200522.18830-1-abuchbinder@google.com> X-Mailer: git-send-email 2.13.2.932.g7449e964c-goog Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Without it, mount (at least from util-linux 2.20.1) tries (and fails) to mount some filesystems as NTFS. Signed-off-by: Adam Buchbinder --- tests/common | 2 +- tests/fsck-tests/012-leaf-corruption/test.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/common b/tests/common index 7ad436e..bed6009 100644 --- a/tests/common +++ b/tests/common @@ -387,7 +387,7 @@ run_check_mount_test_dev() _fail "Invalid \$TEST_MNT: $TEST_MNT" } - run_check $SUDO_HELPER mount $loop_opt "$@" "$TEST_DEV" "$TEST_MNT" + run_check $SUDO_HELPER mount -t btrfs $loop_opt "$@" "$TEST_DEV" "$TEST_MNT" } run_check_umount_test_dev() diff --git a/tests/fsck-tests/012-leaf-corruption/test.sh b/tests/fsck-tests/012-leaf-corruption/test.sh index 43b0e6d..fc10a4f 100755 --- a/tests/fsck-tests/012-leaf-corruption/test.sh +++ b/tests/fsck-tests/012-leaf-corruption/test.sh @@ -90,7 +90,7 @@ check_inode() check_leaf_corrupt_no_data_ext() { image=$1 - $SUDO_HELPER mount -o loop "$image" -o ro "$TEST_MNT" + $SUDO_HELPER mount -o loop -t btrfs "$image" -o ro "$TEST_MNT" i=0 while [ $i -lt ${#leaf_no_data_ext_list[@]} ]; do