From patchwork Wed Jul 5 20:37:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 9827019 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 3EFB2603B5 for ; Wed, 5 Jul 2017 20:39:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2BAFD28583 for ; Wed, 5 Jul 2017 20:39:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1DA992857F; Wed, 5 Jul 2017 20:39:17 +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, FREEMAIL_FROM, 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 B8DD628397 for ; Wed, 5 Jul 2017 20:39:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753271AbdGEUjK (ORCPT ); Wed, 5 Jul 2017 16:39:10 -0400 Received: from mail-pg0-f68.google.com ([74.125.83.68]:34405 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751886AbdGEUjJ (ORCPT ); Wed, 5 Jul 2017 16:39:09 -0400 Received: by mail-pg0-f68.google.com with SMTP id j186so42523pge.1 for ; Wed, 05 Jul 2017 13:39:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=0U5xq21aGpuTVi0QBOOHQnBmWL30RL4ttvdj79NT6gk=; b=pDNwibiVR8B5L2nE48QkiM+xGVlfV6e2MvMb1onwb23fTkSpdqHRfCPJGhC/mFE2GY G+2fIvMDkcPOITzcYJ/rCBXn6mf8YiWS83lwwjtcMshDQVw+fxyPZKLakUVyxp0OV3Lj KLtLcSe5FkqelCLg3Lv/TuyDAjc5Q14s3oSOWRZIhv6fzzHTV06n73U1ueHTolO9xSyz Rm51Z1nu/HgAQDcUEYPiKWRIraYcoFOJsCzHr+idnfPOz5133MejCsMMVHGS9k6kNzHt ISnKAl9+WIJzq6zzMUmDgmsRu7ubS1A51VmfXXMxUNlyq3TRpIN6L8vmJcQoPadDVIAZ mnuA== 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=0U5xq21aGpuTVi0QBOOHQnBmWL30RL4ttvdj79NT6gk=; b=Q+uamkk4S5x4O58XFFcn8/mc7t5SGnDZEIrtMExImBw0kzBuFDmo66Zc+NQNIoByI8 SArF63vZSxzJQI5sp2hBfCsP/V8m9slDd+SWDJSFpCFlZzqgJSPI6kJOdoQdOa0u/C6g c/u1M4eemK9KHnZ8YLdbkytY+bFKBPmD44KCJhVDI0h2rXK9bg9ojvpLjPJiJwzPU92l UTzuHWgCpK1s4HDRgBABmmBAf/lf+Xcywe6AubCCpKDOtdpuiRLsoShUupGpb5a/XRwK m0HBvX/lCa0e9ONmS7YtQUR1GtdhZozabZT+EC6ZWGBCmjxH1IfYDX3eBtOn7/tRqGIz +DJw== X-Gm-Message-State: AIVw111wrmM8MPlxKKrBEqxP+aXC0c4jbe3l+sN1/nbCOSM0A68LS+98 Wq/98QSnYjZ0h3vZNe8= X-Received: by 10.98.31.201 with SMTP id l70mr22521507pfj.128.1499287148150; Wed, 05 Jul 2017 13:39:08 -0700 (PDT) Received: from ebiggers-linuxstation.kir.corp.google.com ([100.66.174.81]) by smtp.gmail.com with ESMTPSA id b28sm35068pfm.9.2017.07.05.13.39.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 05 Jul 2017 13:39:07 -0700 (PDT) From: Eric Biggers To: fstests@vger.kernel.org Cc: Brian Foster , Eric Biggers Subject: [PATCH] generic/247: unmount test device, not scratch device Date: Wed, 5 Jul 2017 13:37:54 -0700 Message-Id: <20170705203754.92140-1-ebiggers3@gmail.com> X-Mailer: git-send-email 2.13.2.725.g09c95d1e9-goog Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Eric Biggers Commit d55123c080cb ("generic/247: filter out expected XFS warnings for mixed mmap/direct I/O") made generic/247 start explicitly unmounting the scratch device. However, the test doesn't actually use the scratch device, so it will fail if SCRATCH_DEV is undefined. Fix it by unmounting the test device instead. Signed-off-by: Eric Biggers --- tests/generic/247 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/generic/247 b/tests/generic/247 index 509e8808..aac70780 100755 --- a/tests/generic/247 +++ b/tests/generic/247 @@ -82,7 +82,7 @@ echo "Silence is golden." # unmount and check dmesg, filtering out expected XFS warnings about mixed # mmap/dio -_scratch_unmount +_test_unmount if [ "$FSTYP" == "xfs" ]; then _check_dmesg _filter_xfs_dmesg else