From patchwork Wed Oct 18 23:37:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 10015585 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 C99E7603FF for ; Wed, 18 Oct 2017 23:37:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BBC4B28C2A for ; Wed, 18 Oct 2017 23:37:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B0C5028C2D; Wed, 18 Oct 2017 23:37:49 +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.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable 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 521E728C2B for ; Wed, 18 Oct 2017 23:37:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751329AbdJRXhs (ORCPT ); Wed, 18 Oct 2017 19:37:48 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:39952 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751007AbdJRXhr (ORCPT ); Wed, 18 Oct 2017 19:37:47 -0400 Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id v9INbiqZ031838 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 18 Oct 2017 23:37:44 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by userv0022.oracle.com (8.14.4/8.14.4) with ESMTP id v9INbisj030453 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 18 Oct 2017 23:37:44 GMT Received: from abhmp0013.oracle.com (abhmp0013.oracle.com [141.146.116.19]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id v9INbiGr021428; Wed, 18 Oct 2017 23:37:44 GMT Received: from localhost (/73.25.142.12) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 18 Oct 2017 16:37:43 -0700 Subject: [PATCH 2/5] common/xfs: refactor xfs_scrub presence testing From: "Darrick J. Wong" To: eguan@redhat.com, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Date: Wed, 18 Oct 2017 16:37:42 -0700 Message-ID: <150836986275.27213.11426507059309321722.stgit@magnolia> In-Reply-To: <150836985024.27213.3715197937819365388.stgit@magnolia> References: <150836985024.27213.3715197937819365388.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Source-IP: userv0022.oracle.com [156.151.31.74] Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Darrick J. Wong Move all the requirements checking for xfs_scrub into a helper function. Make sure the helper properly detects the presence of the scrub ioctl and situations where we can't run scrub (e.g. norecovery). Refactor the existing three xfs_scrub call sites to use the helper to check if it's appropriate to run scrub. Signed-off-by: Darrick J. Wong --- common/rc | 2 +- common/xfs | 40 +++++++++++++++++++++++++++++++++------- tests/generic/453 | 11 +---------- tests/generic/454 | 11 +---------- 4 files changed, 36 insertions(+), 28 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/common/rc b/common/rc index 1a4d81e..83aaced 100644 --- a/common/rc +++ b/common/rc @@ -2091,7 +2091,7 @@ _require_xfs_io_command() _notrun "xfs_io $command support is missing" ;; "scrub"|"repair") - testio=`$XFS_IO_PROG -x -c "$command test 0" $TEST_DIR 2>&1` + testio=`$XFS_IO_PROG -x -c "$command probe 0" $TEST_DIR 2>&1` echo $testio | grep -q "Inappropriate ioctl" && \ _notrun "xfs_io $command support is missing" ;; diff --git a/common/xfs b/common/xfs index dff8454..7d8f275 100644 --- a/common/xfs +++ b/common/xfs @@ -298,6 +298,29 @@ _require_xfs_db_command() _notrun "xfs_db $command support is missing" } +# Does the filesystem mounted from a particular device support scrub? +_supports_xfs_scrub() +{ + mountpoint="$1" + device="$2" + + if [ ! -b "$device" ] || [ ! -e "$mountpoint" ]; then + echo "Usage: _supports_xfs_scrub mountpoint device" + exit 1 + fi + + test "$FSTYP" = "xfs" || return 1 + test -x "$XFS_SCRUB_PROG" || return 1 + + # Probe for kernel support... + $XFS_IO_PROG -x -c "scrub probe 0" "$mountpoint" 2>&1 | grep -q "Inappropriate ioctl" && return 1 + + # Scrub can't run on norecovery mounts + _fs_options "$device" | grep -q "norecovery" && return 1 + + return 0 +} + # run xfs_check and friends on a FS. _check_xfs_filesystem() { @@ -330,14 +353,17 @@ _check_xfs_filesystem() type=`_fs_type $device` ok=1 - if [ "$type" = "xfs" ]; then - if [ -n "$TEST_XFS_SCRUB" ] && [ -x "$XFS_SCRUB_PROG" ]; then - "$XFS_SCRUB_PROG" $scrubflag -v -d -n $device >>$seqres.full - if [ $? -ne 0 ]; then - _log_err "filesystem on $device failed scrub" - ok=0 - fi + # Run online scrub if we can. + mntpt="$(_is_mounted $device)" + if [ -n "$mntpt" ] && _supports_xfs_scrub "$mntpt" "$device"; then + "$XFS_SCRUB_PROG" $scrubflag -v -d -n $device >>$seqres.full + if [ $? -ne 0 ]; then + _log_err "filesystem on $device failed scrub" + ok=0 fi + fi + + if [ "$type" = "xfs" ]; then # mounted ... mountpoint=`_umount_or_remount_ro $device` fi diff --git a/tests/generic/453 b/tests/generic/453 index ff29736..40fae91 100755 --- a/tests/generic/453 +++ b/tests/generic/453 @@ -136,10 +136,7 @@ echo "Test XFS online scrub, if applicable" # Only run this on xfs if xfs_scrub is available and has the unicode checker check_xfs_scrub() { - # Ignore non-XFS fs or no scrub program... - if [ "${FSTYP}" != "xfs" ] || [ ! -x "${XFS_SCRUB_PROG}" ]; then - return 1 - fi + _supports_xfs_scrub "$SCRATCH_MNT" "$SCRATCH_DEV" || return 1 # We only care if xfs_scrub has unicode string support... if ! type ldd > /dev/null 2>&1 || \ @@ -147,12 +144,6 @@ check_xfs_scrub() { return 1 fi - # Does the ioctl work? - if $XFS_IO_PROG -x -c "scrub probe 0" $SCRATCH_MNT 2>&1 | \ - grep -q "Inappropriate ioctl"; then - return 1 - fi - return 0 } diff --git a/tests/generic/454 b/tests/generic/454 index 01279ee..462185a 100755 --- a/tests/generic/454 +++ b/tests/generic/454 @@ -132,10 +132,7 @@ echo "Test XFS online scrub, if applicable" # Only run this on xfs if xfs_scrub is available and has the unicode checker check_xfs_scrub() { - # Ignore non-XFS fs or no scrub program... - if [ "${FSTYP}" != "xfs" ] || [ ! -x "${XFS_SCRUB_PROG}" ]; then - return 1 - fi + _supports_xfs_scrub "$SCRATCH_MNT" "$SCRATCH_DEV" || return 1 # We only care if xfs_scrub has unicode string support... if ! type ldd > /dev/null 2>&1 || \ @@ -143,12 +140,6 @@ check_xfs_scrub() { return 1 fi - # Does the ioctl work? - if $XFS_IO_PROG -x -c "scrub probe 0" $SCRATCH_MNT 2>&1 | \ - grep -q "Inappropriate ioctl"; then - return 1 - fi - return 0 }