From patchwork Tue Feb 5 18:47:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10798059 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6962817FB for ; Tue, 5 Feb 2019 18:47:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 563482C099 for ; Tue, 5 Feb 2019 18:47:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4A3A62C61A; Tue, 5 Feb 2019 18:47: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=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 D83E32C099 for ; Tue, 5 Feb 2019 18:47:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727543AbfBESrQ (ORCPT ); Tue, 5 Feb 2019 13:47:16 -0500 Received: from bombadil.infradead.org ([198.137.202.133]:59478 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727509AbfBESrQ (ORCPT ); Tue, 5 Feb 2019 13:47:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=7/5NY8HEaLKxlKTqZhzemmEBv3h8vLvf4zRCbdVSCB8=; b=OJGzHstNFZ6ECoUUAlTgNBiIC SD6+GRnePAW7LUyYqyU0/bLxYp8vxB4sONfBq8hyF+mw9vimbv5RH/JN65gLeL3e1k8K919nkGQ14 +mJBo9NoLeemaVRigKbXkUo3AEbzuoAZRR9ww8YtQ0G4a7omQFOBoK36rC8spwLLE+x7F0OeOZ9GC xboNY2d+6DZFw+POmdChxByngVmXyu1Y1MgGNaBUwrOcZxQ7JuuzgIlbEME1wcxyK3S6Ui3rd5beT ze4VCHzPkd+K525FhmRuP/VXILpL1fQoATqna56gLLs3NBukCBa/+bzQWDT/fBbQZqvuTTodNH1eo P/sjt4IAg==; Received: from 089144212163.atnat0021.highway.a1.net ([89.144.212.163] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1gr5kZ-0001j4-Pm for fstests@vger.kernel.org; Tue, 05 Feb 2019 18:47:16 +0000 From: Christoph Hellwig To: fstests@vger.kernel.org Subject: [PATCH] generic: detect preallocation support for fsx tests 075 and 112 Date: Tue, 5 Feb 2019 19:47:13 +0100 Message-Id: <20190205184713.20266-1-hch@lst.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Currently generic/075 and generic/112 have two extra fsx passes each that exercise fsx with preallocation, which are only enabled for XFS. These tests can also be run with other file systems, given that the XFS prealloc ioctls are implemented in generic code since the addition of the fallocate system call. This also means a version of XFS that does not support preallocation (e.g. because it always writes out of place) can skip the prealloc tests while still completing the normal fsx tests just fine. Signed-off-by: Christoph Hellwig --- tests/generic/075 | 16 +++++++++++----- tests/generic/112 | 20 +++++++++++++------- 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/tests/generic/075 b/tests/generic/075 index 2b957891..8981c560 100755 --- a/tests/generic/075 +++ b/tests/generic/075 @@ -48,11 +48,12 @@ _do_test() echo "fsx.$_n : $_filter_param" echo "-----------------------------------------------" - if [ "$FSTYP" != "xfs" ] - then - if [ "$_n" = "1" -o "$_n" = "3" ] - then - # HACK: only xfs handles preallocation (-x) so just skip this test + if [ "$_n" = "1" -o "$_n" = "3" ]; then + if echo $testio | grep -q "Operation not supported"; then + # + # Skip the prealloc runs if the file system does not support + # preallocation + # return fi fi @@ -128,6 +129,11 @@ echo "brevity is wit..." _check_test_fs +# check if preallocation is supported +testfile=$TEST_DIR/$$.xfs_io +testio=`$XFS_IO_PROG -F -f -c "falloc 0 1m" $testfile 2>&1` +rm -f $testfile 2>&1 > /dev/null + # Options: # -d: debug output for all operations # -l flen: the upper bound on file size (default 262144) diff --git a/tests/generic/112 b/tests/generic/112 index 1879e7b5..a6f8fc14 100755 --- a/tests/generic/112 +++ b/tests/generic/112 @@ -48,13 +48,14 @@ _do_test() echo "fsx.$_n : $_filter_param" echo "-----------------------------------------------" - if [ "$FSTYP" != "xfs" ] - then - if [ "$_n" = "1" -o "$_n" = "3" ] - then - # HACK: only xfs handles preallocation (-x) so just skip this test - return - fi + if [ "$_n" = "1" -o "$_n" = "3" ]; then + if echo $testio | grep -q "Operation not supported"; then + # + # Skip the prealloc runs if the file system does not support + # preallocation + # + return + fi fi # This cd and use of -P gets full debug on $here (not TEST_DEV) @@ -128,6 +129,11 @@ echo "brevity is wit..." _check_test_fs +# check if preallocation is supported +testfile=$TEST_DIR/$$.xfs_io +testio=`$XFS_IO_PROG -F -f -c "falloc 0 1m" $testfile 2>&1` +rm -f $testfile 2>&1 > /dev/null + # Options: # -d: debug output for all operations # -l flen: the upper bound on file size (default 262144)