From patchwork Fri Jan 26 07:59:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 10185237 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 1B2A760383 for ; Fri, 26 Jan 2018 07:58:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0F037290E8 for ; Fri, 26 Jan 2018 07:58:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 03D68290EC; Fri, 26 Jan 2018 07:58:16 +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, FREEMAIL_FROM, 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 A87AC290E8 for ; Fri, 26 Jan 2018 07:58:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752142AbeAZH6P (ORCPT ); Fri, 26 Jan 2018 02:58:15 -0500 Received: from mail-wr0-f194.google.com ([209.85.128.194]:38139 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751852AbeAZH6O (ORCPT ); Fri, 26 Jan 2018 02:58:14 -0500 Received: by mail-wr0-f194.google.com with SMTP id a1so5300579wri.5; Thu, 25 Jan 2018 23:58:13 -0800 (PST) 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=K64tW18VEFyoD2PjwzLQDMdp7Bc7PbTOL5uFlaczFW0=; b=EUK9FuNJv+i/d+xbEXCCS0QjbMezFEBpUgBdLiByliJA1PxjCcJDsYe+ky1tSAEQN+ D8W0r8enZETjSJNK0t8XRILTqrZnsJm60sGDVlWEyA+RBW0oSmUQIWakENPeiZo5U6IZ QmOEuP7YnXsZxXW76jXZZK4OCXu7vDg4TQIInr8Xff5Ypoy9mUwM/9cywZ+8NWdWy7pN bGbUHVRqWOcnKSJgpegtpVxm/pDpHjuWEiPfB9fXtI0wi980qTHc5m/G3fl2MaqZCJ6I KtQfvC6bDzsOpBavndc3Ek0qojG0qRjblXmo3gvwaAAW77an7cYfzShSSGijNSF7eOqQ vThw== 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=K64tW18VEFyoD2PjwzLQDMdp7Bc7PbTOL5uFlaczFW0=; b=gc17IySnH4C+xAg7LWCRQE8AxuApjwBipQkqIaoe6m9kJ6NCGHaa5z6RBkkV4nAsd1 j9IK69yABwClPZDw+1nlwblBdwVtotcXhBJOShUwqSgPryURWtVGsuVr0L3p7jJPe1pm QaowtSzb/rqCNl8GeX4k3yDMflzNjiMAdd0zS2FZ7QsHl7qVXPvc5JZ0HAD6kQW9O640 VHki1fBgU+jVa1Ji9qwZvgFEXxPCc9izj6hsd40G/TOs7uyKZeBQonzzvNq/V6eGH+HB c2qPDiI2LUFPLxI6COInNTH+CTBScMETIPsG+R3hxic3N8f1pj8X6nH49R1/5Bcqbkkj 0Y0A== X-Gm-Message-State: AKwxytcoLZS8Kn7gvUMeSmCcskIjgtKGEA73zdZ8reC60jbAXbTy1sjk 8OTnDZXk0G4iiC7ltvd+feQ= X-Google-Smtp-Source: AH8x22571bP5yvcdOB7z3I6VdnVtTnNPKL7gHU4GPcn+HHHSMHtDe4ykyGjGktMYO/SBPaoaa36Nhw== X-Received: by 10.223.141.139 with SMTP id o11mr4937586wrb.0.1516953492818; Thu, 25 Jan 2018 23:58:12 -0800 (PST) Received: from localhost.localdomain ([141.226.162.233]) by smtp.gmail.com with ESMTPSA id 44sm10088261wrv.0.2018.01.25.23.58.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 25 Jan 2018 23:58:12 -0800 (PST) From: Amir Goldstein To: Eryu Guan Cc: zhangyi , Miklos Szeredi , linux-unionfs@vger.kernel.org, fstests@vger.kernel.org Subject: [PATCH 4/4] overlay/017: require and enable redirect_dir Date: Fri, 26 Jan 2018 09:59:08 +0200 Message-Id: <1516953548-15679-5-git-send-email-amir73il@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516953548-15679-1-git-send-email-amir73il@gmail.com> References: <1516953548-15679-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 This test renames a merge directory so it needs to enable redirect_dir feature, which is not enabled by default. Signed-off-by: Amir Goldstein --- tests/overlay/017 | 6 ++++-- tests/overlay/group | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/overlay/017 b/tests/overlay/017 index 03955d0..e7e8925 100755 --- a/tests/overlay/017 +++ b/tests/overlay/017 @@ -57,6 +57,7 @@ _supported_os Linux _require_scratch _require_test_program "af_unix" _require_test_program "t_dir_type" +_require_scratch_feature redirect_dir rm -f $seqres.full @@ -111,7 +112,8 @@ function check_inode_numbers() done } -_scratch_mount +# Enable redirect_dir for renaming a merge directory +_scratch_mount -o "redirect_dir=on" rm -f $tmp.* @@ -140,7 +142,7 @@ echo 3 > /proc/sys/vm/drop_caches check_inode_numbers $testdir $tmp.after_copyup $tmp.after_move # Verify that the inode numbers survive a mount cycle -_scratch_cycle_mount +_scratch_cycle_mount "redirect_dir=on" # Compare inode numbers before/after mount cycle check_inode_numbers $testdir $tmp.after_move $tmp.after_cycle diff --git a/tests/overlay/group b/tests/overlay/group index 7e541e4..edea64a 100644 --- a/tests/overlay/group +++ b/tests/overlay/group @@ -19,7 +19,7 @@ 014 auto quick copyup 015 auto quick whiteout 016 auto quick copyup -017 auto quick copyup +017 auto quick copyup redirect 018 auto quick copyup hardlink 019 auto stress 020 auto quick copyup perms