From patchwork Mon Aug 27 18:29:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 10577461 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 D220F174C for ; Mon, 27 Aug 2018 18:27:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C5E8D29DB3 for ; Mon, 27 Aug 2018 18:27:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B9FDB29F16; Mon, 27 Aug 2018 18:27:42 +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=-4.7 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, RCVD_IN_SBL_CSS 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 7232629D87 for ; Mon, 27 Aug 2018 18:27:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727433AbeH0WPV (ORCPT ); Mon, 27 Aug 2018 18:15:21 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:40320 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726895AbeH0WPV (ORCPT ); Mon, 27 Aug 2018 18:15:21 -0400 Received: by mail-wm0-f66.google.com with SMTP id 207-v6so9126683wme.5; Mon, 27 Aug 2018 11:27:37 -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:in-reply-to:references; bh=IpWK0uO5ILS7JBw5KapHf2CMmVMfsKX+x1OfUWzC9Hs=; b=GzZp9HVzQn1attt3rTZsrAbEQqan/UxXdxWKuFQ5tKQmrdzevZicfAL8n9qQJ4FDOb eRwwBSqxoicRB3bKAnxNM/hJ7rLmlXOyr0zyC8kbSvJwKL6jUDcibpPTjkCEyA80+iBS NRWxxiAJAyHp2bEYF48u/5KcLOnQi+SBTSlDQ6s3QK3XFSuhSsusjpKpP4BzcR6vx5W8 8A0gd1SRVmhqLZvdxFCN0Vhyx6YHEw3g6Q35WwNo/RHWofPkgm3zqz/+bRf1hLFUWL7j /jjVZx5az4dAdWYUMCjOstn/ITzAZjbGYS4Bf6937Df4ZMG5ar/5IkvwzslA1Xu6BmB1 VF3w== 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=IpWK0uO5ILS7JBw5KapHf2CMmVMfsKX+x1OfUWzC9Hs=; b=cVzHlU+sJmhycc5V1c4GUR1NvQZIB2m8gLykkYXE93gUr5eQnwF1l9vwou50gkurN1 XuvC0Dp5gp4Zs+IdQcYbfpBQSoPVS+me6UQamHq1ucKNWirnwM4iWw3RO1apqH+e4zJF SSIjKLYqmmX4zl2TyoNgwbKHbgxPYn2hzFMp/lz7zTnnJlpl/ILvV+ukEYuqN34rn7ID 77KfgWZo9KQPTtrT8aXe+xWgJSp6xOlSfpEvqWrc2EtottGnFcmv0TIJQ2dAENZhbgU8 EzBaz96JkfMzioz3ELcgw0yBvEmWgpNiKZwb7e0AdNdp30hQoxx7c03P6iVuhXIQmVcZ ROjg== X-Gm-Message-State: APzg51Bhout287r5YLIRglox2o4V+AdJOe3IOz3d45Bz0JNRNNlVoA1i oDuUWqPZstYgdDLASuByQdV1VmMl X-Google-Smtp-Source: ANB0VdZhuJPbs+CPJ9qQrCV11qmlqN53y7ewb8tsd4owrMohUZM1Ej0LUJX/+3LS9Dxa/fc/WJBv1Q== X-Received: by 2002:a1c:8414:: with SMTP id g20-v6mr6802036wmd.90.1535394456835; Mon, 27 Aug 2018 11:27:36 -0700 (PDT) Received: from localhost.localdomain ([141.226.8.68]) by smtp.gmail.com with ESMTPSA id r66-v6sm4658211wmb.37.2018.08.27.11.27.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 27 Aug 2018 11:27:36 -0700 (PDT) From: Amir Goldstein To: Eryu Guan Cc: Theodore Ts'o , fstests@vger.kernel.org, linux-ext4@vger.kernel.org, linux-unionfs@vger.kernel.org Subject: [PATCH 1/2] overlay: do not set OVL_BASE_FSTYP value to "overlay" Date: Mon, 27 Aug 2018 21:29:25 +0300 Message-Id: <1535394566-18837-2-git-send-email-amir73il@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1535394566-18837-1-git-send-email-amir73il@gmail.com> References: <1535394566-18837-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 The purpose of OVL_BASE_FSTYP is to store the value of FSTYP that is found in a host config file section. When there is no host config file or if user sets FSTYP=overlay in config file, it makes no sense to store the value "overlay" in OVL_BASE_FSTYP and it is better to leave it empty or leave its current value in tact. This allows user to set OVL_BASE_FSTYP in config file or before running the test to support queries about base fs, such as _require_metadata_journaling, even when running an overlay test. Signed-off-by: Amir Goldstein --- common/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/config b/common/config index 2f1f272..d85519a 100644 --- a/common/config +++ b/common/config @@ -530,7 +530,7 @@ _overlay_config_override() [ -b "$TEST_DEV" ] || return 0 # Config file may specify base fs type, but we obay -overlay flag - export OVL_BASE_FSTYP="$FSTYP" + [ "$FSTYP" == overlay ] || export OVL_BASE_FSTYP="$FSTYP" export FSTYP=overlay # Store original base fs vars From patchwork Mon Aug 27 18:29:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 10577463 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 55C1917DE for ; Mon, 27 Aug 2018 18:27:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4880D29DB3 for ; Mon, 27 Aug 2018 18:27:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3B2DA29E81; Mon, 27 Aug 2018 18:27:43 +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=-4.7 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, RCVD_IN_SBL_CSS 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 D1B9829FE1 for ; Mon, 27 Aug 2018 18:27:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727451AbeH0WPY (ORCPT ); Mon, 27 Aug 2018 18:15:24 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:33218 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727410AbeH0WPW (ORCPT ); Mon, 27 Aug 2018 18:15:22 -0400 Received: by mail-wm0-f67.google.com with SMTP id i134-v6so10620821wmf.0; Mon, 27 Aug 2018 11:27:38 -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:in-reply-to:references; bh=TTbnBjzrn7Cjye/QigISKtoKjD83rD2IPwOxU9IUOQk=; b=SyM7zVlbHw+aMAzcfZM/dt7pB5+KFdZJICQqLN5FNx6bf5WymHGjKqNtD3AdQglDku Poi7iWgOKGyOCgVKKLRtv3FYVug2t1JbBG+QGrwgpjLJL5J4r8jZ+L51VMcd9OC21Akv FPpeTsKH4GI6gHRcUEApzsGsGvgy9SgvW2PXV7WaICFFi0f30lBaGtvZ/XtbZo8L0IqJ WCWOBKT/PxNfBifGluGWU3+QnUytw3REk6WXBR5BaPkNEeLugPgHeFlJ4mpqhVmCD5dK KvvuRTFAFjeNjuUiHDHL0gxe1zczwIFfyzEcwxViotaBTz5ogChl8o+eF2hslM8vIYuc TrVw== 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=TTbnBjzrn7Cjye/QigISKtoKjD83rD2IPwOxU9IUOQk=; b=K7ZUCScFNNh/nVJNR5eCts6MPTd02zXEMS3b7P8GtCyQRdk6PUII6nrD8Xfz4pcJSe 3AkTbgEqUMIloy+seNiEAbp++l21SP647flSIHaDNnRZO1T3e7qKzNkCw62j2AsBeEyb Seurf+zZmxaW3kQkCebC3ma1JJZbUfX/B0vO1wb5V6vnH025jWN6x9JpmIp7E3ZdceaY fhJVxc8K/zamCpIQDH0fkEUiYkoIROwjUg8C6xdj9JB+A8h0UU3iV76Ww+1pYqVE4+QR 9IZo/qCznVW9z+A2gfdKBjZSkMyVa0b0EiHFcJJSv6FnEl2QVo0/YTur0g5SJhJFbvY4 y9eQ== X-Gm-Message-State: APzg51CIyWBdcnZXlcsJcr3MZaN8NewVhXSIMM28PKBoq7l+OwExCiMS 5IevG70ff7xGYBsDNu3SRa4JuAUo X-Google-Smtp-Source: ANB0VdYfAHScBqsm+AVEyJyekvMskSfrUX7dOWYep5cA97wspY/RBzuHo5FliuCFszUd5c/lPNKlmg== X-Received: by 2002:a1c:8e81:: with SMTP id q123-v6mr6251116wmd.56.1535394458237; Mon, 27 Aug 2018 11:27:38 -0700 (PDT) Received: from localhost.localdomain ([141.226.8.68]) by smtp.gmail.com with ESMTPSA id r66-v6sm4658211wmb.37.2018.08.27.11.27.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 27 Aug 2018 11:27:37 -0700 (PDT) From: Amir Goldstein To: Eryu Guan Cc: Theodore Ts'o , fstests@vger.kernel.org, linux-ext4@vger.kernel.org, linux-unionfs@vger.kernel.org Subject: [PATCH 2/2] generic/009: fix test failure with overlay over ext4 Date: Mon, 27 Aug 2018 21:29:26 +0300 Message-Id: <1535394566-18837-3-git-send-email-amir73il@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1535394566-18837-1-git-send-email-amir73il@gmail.com> References: <1535394566-18837-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 running test with overlayfs and ext4 as base fs, we need to disable extent zeroout on the underlying base fs. Signed-off-by: Amir Goldstein --- Eryu, Suggestions for a cleaner approach are welcome. Thanks, Amir. tests/generic/009 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/generic/009 b/tests/generic/009 index fa6ef46..a4f56d0 100755 --- a/tests/generic/009 +++ b/tests/generic/009 @@ -39,6 +39,9 @@ testfile=$TEST_DIR/009.$$ if [ "$FSTYP" = "ext4" ]; then _ext4_disable_extent_zeroout fi +if [ "$FSTYP" = "overlay" -a "$OVL_BASE_FSTYP" = "ext4" ]; then + _ext4_disable_extent_zeroout "$OVL_BASE_TEST_DEV" +fi # When PAGE_SIZE > 4096 some filesystems extent layout is different so # it would not match the output.