From patchwork Sun Feb 12 20:43:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 9568505 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 A00C060476 for ; Sun, 12 Feb 2017 20:43:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 90F7B281C3 for ; Sun, 12 Feb 2017 20:43:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8528928249; Sun, 12 Feb 2017 20:43:57 +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.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, 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 0BA272823E for ; Sun, 12 Feb 2017 20:43:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751247AbdBLUn4 (ORCPT ); Sun, 12 Feb 2017 15:43:56 -0500 Received: from mail-wr0-f194.google.com ([209.85.128.194]:36523 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751000AbdBLUnz (ORCPT ); Sun, 12 Feb 2017 15:43:55 -0500 Received: by mail-wr0-f194.google.com with SMTP id k90so21375833wrc.3; Sun, 12 Feb 2017 12:43:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=I4iqq0CzQ3nifg49LmpxwJlv23AqsjaZB969MjeKpoU=; b=A5ujx0ZUcwCl/0y+gGOi2AfUjK7Z5ZaiIYa7HTn0ekPoYmU578jYjzZa24Bzl7NyuZ qbi5+5Ly/kLWsMwfsAZD1N9sbNhimb4i82EhOKxWNw4OfJUhD096ZxnhWcM+uU6ZRI8F k3OHaMvruZF5//caB7NR7l9wvuBqiWOOFGgCyJ5otzXPvTkOYwdDKUudOSn/EK/epWWz H4oeFkc6WjUs4mtf5ZJNPxo+g+ilvJ2YLZ29afLkKslJyQugTZR5Kv3YjTA6VV4aAEEG Tk07aspzAYnrq0NMkNTZCwzCrsWuGFcL8+vQLZF9VSY+ZeRY4DMIpWYIstock+Ns/5y4 YRPg== 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:in-reply-to :references; bh=I4iqq0CzQ3nifg49LmpxwJlv23AqsjaZB969MjeKpoU=; b=hgc4mcDAQ5AiALBfvi+Uaabk5Q1cGe3eUW/+ufl7Mk79ZDCF4HsQl77MXCe4GBfRVv ZvRXUvGLmxJBLqUbyvw+X+pX7JtpSU45OcQzDUI491NATtReG0EB9Nse94QkiRUN9R6+ pIm0vbspnjHo4Y7nZNR9cVi0hlbHGxOHZY+O2z3A0TEPqXM9gAXDrdaYimyOpqUHs5e1 805elaojrs7FREdPbQl3ASYaJI3onz/9aAy/8fURnZK7QFBQh6gIUa/2QgU1EnKKHZNf TumgGR+1N9PsrQ7DbvKwBLBIp41E+xX80IIWuD2zUy0yyGQ/gcKJlX9Nsg4z6zKuZ3GQ 81yQ== X-Gm-Message-State: AMke39mb9RbXkCszEkv+QswzAVWUPFqslXwwvj9l6mD6NMjsG2v3Ffdj0UTQvNhYcHPlzA== X-Received: by 10.223.134.253 with SMTP id 58mr19409429wry.46.1486932234135; Sun, 12 Feb 2017 12:43:54 -0800 (PST) Received: from localhost.localdomain (bzq-79-176-143-83.red.bezeqint.net. [79.176.143.83]) by smtp.gmail.com with ESMTPSA id o59sm8040404wrc.56.2017.02.12.12.43.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 12 Feb 2017 12:43:53 -0800 (PST) From: Amir Goldstein To: Eryu Guan Cc: Miklos Szeredi , linux-unionfs@vger.kernel.org, fstests@vger.kernel.org Subject: [PATCH v3 1/9] fstests: sanity check that test partitions are not mounted elsewhere Date: Sun, 12 Feb 2017 22:43:36 +0200 Message-Id: <1486932224-17075-2-git-send-email-amir73il@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1486932224-17075-1-git-send-email-amir73il@gmail.com> References: <1486932224-17075-1-git-send-email-amir73il@gmail.com> Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When $TEST_DEV is mounted at a different location then $TEST_DIR, _require_test() aborts the test with an error: TEST_DEV=/dev/sda5 is mounted but not on TEST_DIR=/mnt/test There are several problems with current sanity check: 1. the output of the error is mixed into out.bad and hard to see 2. the test partition is unmounted at the end of the test regardless of the fact that it not pass the sanity that we have exclusivity 3. scratch partition has a similar sanity check in _require_scratch(), but we may not get to it, because $SCRATCH_DEV is unmounted prior to running the tests (which could unmount another mount point). To solve all these problems, introduce a helper _check_mounted_on(). It checks if a device is mounted on a given mount point and optionally checks the mounted fs type. The sanity checks in _require_scratch() and _require_test() are converted to use the helper and gain the check for correct fs type. The helper is used in init_rc() to sanity check both test and scratch partitions, before tests are run and before $SCRATCH_DEV is unmounted. Signed-off-by: Amir Goldstein --- common/rc | 83 +++++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 49 insertions(+), 34 deletions(-) diff --git a/common/rc b/common/rc index 76515e2..d831b17 100644 --- a/common/rc +++ b/common/rc @@ -1319,6 +1319,43 @@ _supported_os() _notrun "not suitable for this OS: $HOSTOS" } +# check if a FS on a device is mounted +# if so, verify that it is mounted on mount point +# if fstype is given as argument, verify that it is also +# mounted with correct fs type +# +_check_mounted_on() +{ + local devname=$1 + local dev=$2 + local mntname=$3 + local mnt=$4 + local type=$5 + + # Note that we use -F here so grep doesn't try to interpret an NFS over + # IPv6 server as a regular expression + local mount_rec=`_mount | grep -F "$dev"` + [ -n "$mount_rec" ] || return 1 + + # if it's mounted, make sure its on $mnt + if ! (echo $mount_rec | grep -q "$mnt") + then + echo "$devname=$dev is mounted but not on $mntname=$mnt - aborting" + echo "Already mounted result:" + echo $mount_rec + exit 1 + fi + + if [ -n "$type" -a "`_fs_type $dev`" != "$type" ] + then + echo "$devname=$dev is mounted but not a type $type filesystem" + # raw $DF_PROG cannot handle NFS/CIFS/overlay correctly + _df_device $dev + exit 1 + fi + return 0 +} + # this test needs a scratch partition - check we're ok & unmount it # No post-test check of the device is required. e.g. the test intentionally # finishes the test with the filesystem in a corrupt state @@ -1373,21 +1410,9 @@ _require_scratch_nocheck() ;; esac - # mounted? - # Note that we use -F here so grep doesn't try to interpret an NFS over - # IPv6 server as a regular expression. - mount_rec=`_mount | grep -F $SCRATCH_DEV` - if [ "$mount_rec" ] + if _check_mounted_on SCRATCH_DEV $SCRATCH_DEV SCRATCH_MNT $SCRATCH_MNT then - # if it's mounted, make sure its on $SCRATCH_MNT - if ! echo $mount_rec | grep -q $SCRATCH_MNT - then - echo "\$SCRATCH_DEV=$SCRATCH_DEV is mounted but not on \$SCRATCH_MNT=$SCRATCH_MNT - aborting" - echo "Already mounted result:" - echo $mount_rec - exit 1 - fi - # and then unmount it + # if it's mounted, unmount it if ! _scratch_unmount then echo "failed to unmount $SCRATCH_DEV" @@ -1458,21 +1483,8 @@ _require_test() ;; esac - # mounted? - # Note that we use -F here so grep doesn't try to interpret an NFS over - # IPv6 server as a regular expression. - mount_rec=`_mount | grep -F $TEST_DEV` - if [ "$mount_rec" ] + if ! _check_mounted_on TEST_DEV $TEST_DEV TEST_DIR $TEST_DIR then - # if it's mounted, make sure its on $TEST_DIR - if ! echo $mount_rec | grep -q $TEST_DIR - then - echo "\$TEST_DEV=$TEST_DEV is mounted but not on \$TEST_DIR=$TEST_DIR - aborting" - echo "Already mounted result:" - echo $mount_rec - exit 1 - fi - else out=`_mount_or_remount_rw "$MOUNT_OPTIONS" $TEST_DEV $TEST_DIR` if [ $? -ne 1 ]; then echo $out @@ -3075,13 +3087,16 @@ init_rc() fi fi - if [ "`_fs_type $TEST_DEV`" != "$FSTYP" ] - then - echo "common/rc: Error: \$TEST_DEV ($TEST_DEV) is not a MOUNTED $FSTYP filesystem" - # raw $DF_PROG cannot handle NFS/CIFS/overlay correctly - _df_device $TEST_DEV - exit 1 + # Sanity check that TEST partition is not mounted at another mount point + # or as another fs type + _check_mounted_on TEST_DEV $TEST_DEV TEST_DIR $TEST_DIR $FSTYP + if [ -n "$SCRATCH_DEV" ]; then + # Sanity check that SCRATCH partition is not mounted at another + # mount point, because it is about to be unmounted and formatted. + # Another fs type for scratch is fine (bye bye old fs type). + _check_mounted_on SCRATCH_DEV $SCRATCH_DEV SCRATCH_MNT $SCRATCH_MNT fi + # Figure out if we need to add -F ("foreign", deprecated) option to xfs_io $XFS_IO_PROG -c stat $TEST_DIR 2>&1 | grep -q "is not on an XFS filesystem" && \ export XFS_IO_PROG="$XFS_IO_PROG -F"