From patchwork Thu Apr 5 22:21:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 10325527 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 C833160467 for ; Thu, 5 Apr 2018 22:22:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A8938292F7 for ; Thu, 5 Apr 2018 22:22:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9CAF5293D1; Thu, 5 Apr 2018 22:22:32 +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, 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 42D3D292F7 for ; Thu, 5 Apr 2018 22:22:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753911AbeDEWWc (ORCPT ); Thu, 5 Apr 2018 18:22:32 -0400 Received: from mail-pl0-f67.google.com ([209.85.160.67]:46616 "EHLO mail-pl0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753510AbeDEWWb (ORCPT ); Thu, 5 Apr 2018 18:22:31 -0400 Received: by mail-pl0-f67.google.com with SMTP id 59-v6so18589095plc.13 for ; Thu, 05 Apr 2018 15:22:31 -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=JUoiiriAC+AtZBbARd5hIOGudKh02kuwdN9D0MldxtY=; b=JN7jCIjdSQ60DRTyj75a78laC+fBnpWcjqihGtOblfQwlro52rv1KXNcEr0bKVKQA2 J6NKZ148eimLJyeesThuPSpDyJ33vXmgIgAw34MIKLLH74YyngcPs0OBusU/bcsuUqiU mSe6vxm6ubBZLoedpg9gnhku457pMlc+jH49hLRKkVTOBaKuODL0v+0bmSpC2o3B1ocZ F6HDBxNX9NBvNukdQhS3JGsDBGnEnt2T0QA86qpwNgyCNsgT4X1IV5TPrDgCfo4NRPsc iXNPvN9nzCceNeteZhBaDjdEgITLp48w03xdyfu8GjrTlrNRT4rS54QIHMlh1RTgkGxw hFjQ== 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=JUoiiriAC+AtZBbARd5hIOGudKh02kuwdN9D0MldxtY=; b=olxaBuqsNSm4/47NcRZO6/jkJ6eOaohKyc3j3JdN6eHTQPE6ZvcdFxCZxi38tEkcCR JA2Cu+63NMp/zn0h0nOy6FgsdfwlCx+/bJg/o+se0td6gm76iSbS7Bwc0HTMyWHJMvHh I3FsL5ofk0DrvDMy7RB99OKqzAHNuBjoR50Ql9T5ofIThuG3gLykusemj+wPo+Kl9rjn Ig5PYd5WKQ5CcdxXPWUobdTxidCXosZTZMwXE45mxatU77+E5SVLBaoEXokalHuiUohY bBLqapHpuD11jt/mv6ZwLs7zETJB15oa/oRDxQJIzc4QXWa3I7tW/c8SbmDH7GaNPN9p 26xg== X-Gm-Message-State: AElRT7GtRu0OzyW0q2HpNkknqvdq1wUZ+8gP0v2O4ZfzNOyYj2YjArnX 8o+A6dE07puZxfATZ9FgzBNTzvhGBNc= X-Google-Smtp-Source: AIpwx4+ss45yaxtSh0KSEMimQFDNLDA4YH6PtUS2mPDu8IgmL09vsZAu9W51etyscGQi5Qlfg7XeRw== X-Received: by 10.99.100.196 with SMTP id y187mr15666691pgb.83.1522966950805; Thu, 05 Apr 2018 15:22:30 -0700 (PDT) Received: from ebiggers-linuxstation.kir.corp.google.com ([2620:15c:17:3:dc28:5c82:b905:e8a8]) by smtp.gmail.com with ESMTPSA id u13sm18487992pfd.112.2018.04.05.15.22.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Apr 2018 15:22:29 -0700 (PDT) From: Eric Biggers To: Theodore Ts'o Cc: fstests@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, Eric Biggers Subject: [xfstests-bld PATCH] test-appliance: support f2fs-tools v1.9 and later Date: Thu, 5 Apr 2018 15:21:41 -0700 Message-Id: <20180405222141.42376-1-ebiggers@google.com> X-Mailer: git-send-email 2.17.0.484.g0c8726318c-goog Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Pass the -f option to mkfs.f2fs when it appears to support it. This is required by f2fs-tools v1.9 and later in order to format the filesystem even when an existing filesystem is detected. But earlier versions did not accept this option. Signed-off-by: Eric Biggers --- kvm-xfstests/test-appliance/files/root/fs/f2fs/config | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kvm-xfstests/test-appliance/files/root/fs/f2fs/config b/kvm-xfstests/test-appliance/files/root/fs/f2fs/config index 45fb2dd..0efcb76 100644 --- a/kvm-xfstests/test-appliance/files/root/fs/f2fs/config +++ b/kvm-xfstests/test-appliance/files/root/fs/f2fs/config @@ -20,6 +20,10 @@ function format_filesystem() local dev="$1" local opts="$2" + if grep -q 'force overwrite' /sbin/mkfs.f2fs; then + # f2fs-tools v1.9+ + opts+=" -f" + fi /sbin/mkfs.f2fs -q $opts "$dev" return $? }