From patchwork Thu Apr 26 05:53: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: 10364651 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 CA513601BE for ; Thu, 26 Apr 2018 05:52:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BB2B02868D for ; Thu, 26 Apr 2018 05:52:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AFB3F2900D; Thu, 26 Apr 2018 05:52:09 +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.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, MAILING_LIST_MULTI, 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 3D04A2868D for ; Thu, 26 Apr 2018 05:52:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751396AbeDZFwI (ORCPT ); Thu, 26 Apr 2018 01:52:08 -0400 Received: from mail-io0-f195.google.com ([209.85.223.195]:34210 "EHLO mail-io0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752756AbeDZFwH (ORCPT ); Thu, 26 Apr 2018 01:52:07 -0400 Received: by mail-io0-f195.google.com with SMTP id p124-v6so4424973iod.1; Wed, 25 Apr 2018 22:52:07 -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=C6bi7qVxgG20y7dxYGXqwK/fR9Q4XnONDXPj+Ej+IZo=; b=MDNXmkc87+o/IHyCcSWt8xV3jlJGT3N/oWB57Lo0Z4LIKFLQgUYLaxuastkC4OvAiR gSWUuvk68oQVC1vFROt11FcLv9smQebUirlkXzpqoXAwhsspRsMCcoq2MUaWpF1wv3NY JWygKFjDoEGy9jg3pinLAciTy3DfudYLYNBZlqqJC7LGoQBFUmMS62HepJSdBMHD6HWw o4/aimFlDf6Cu4ftv5CRG/6zB3FSGnUdIp9W+lAusJR6uU3Hl+7Bq69zvBjoBZqdlDOM N6ha11zVxPKsV8JHhfDza2DAuEmDIkRvx76MTTR0TC7dvgw2QGv9GPBxEpdvZ1ALn3+M 9Cdw== 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=C6bi7qVxgG20y7dxYGXqwK/fR9Q4XnONDXPj+Ej+IZo=; b=t8HZjOIWGPYjp725xYNkFTGCkf8p2VzBCCqgY7vy3ymorQNDjKXd/1MeokAlhzqD1L 8gO/0dPblqkfgbTcfjm36UOmgQ8BuwwtoYAQzecmDeeR5roAgtijSattczYRu5K0LHyD r3tFwMiLshv9wAJkbHG++7iM6A9BCKUB8Cqru8weWW3aERhlthaDQxTLuLBC9sVEqcif JifuYpiSTiLd+NHowxC2pY+5Gxl5kBBkCRIpQjml8wefME59hBWnwu7D3j0L/j3zH7LZ h7GFop4RhKzlz2j+UbX3JGrHazMPSIADgv1qmtVIRohx4x+oPQdegVWAjpn+9cUdlMTT sCLA== X-Gm-Message-State: ALQs6tCZw98nP4jij/UmH7gzGO1VcQoI4QRdMTMLELPhYWMDDmfKpLwu n93mA4cDe/7c7k43wUGyRMY= X-Google-Smtp-Source: AB8JxZqFiGZg+Ppehb9EuvWa29y8kxfZS4CJMpo0+DhaoLVtbomeaqLaAd6D4Nx6M/kENMzpCqChlw== X-Received: by 2002:a6b:b68a:: with SMTP id g132-v6mr32019968iof.182.1524721926880; Wed, 25 Apr 2018 22:52:06 -0700 (PDT) Received: from amir-VirtualBox.Home (174-23-139-12.slkc.qwest.net. [174.23.139.12]) by smtp.gmail.com with ESMTPSA id t9-v6sm2258493ioa.82.2018.04.25.22.52.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 25 Apr 2018 22:52:06 -0700 (PDT) From: Amir Goldstein To: Eryu Guan Cc: Miklos Szeredi , linux-unionfs@vger.kernel.org, fstests@vger.kernel.org Subject: [PATCH v2 3/4] overlay/043: require and enable redirect_dir Date: Wed, 25 Apr 2018 23:53:26 -0600 Message-Id: <1524722007-30891-4-git-send-email-amir73il@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1524722007-30891-1-git-send-email-amir73il@gmail.com> References: <1524722007-30891-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/043 | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/overlay/043 b/tests/overlay/043 index 46df686..f70ee7f 100755 --- a/tests/overlay/043 +++ b/tests/overlay/043 @@ -62,6 +62,8 @@ _require_scratch_nocheck _require_test _require_test_program "af_unix" _require_test_program "t_dir_type" +# Require redirect_dir for renaming a merge directory +_require_scratch_feature redirect_dir rm -f $seqres.full @@ -83,7 +85,8 @@ _scratch_mkfs >>$seqres.full 2>&1 upperdir=$OVL_BASE_SCRATCH_MNT/$OVL_UPPER workdir=$OVL_BASE_SCRATCH_MNT/$OVL_WORK -_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir +# Enable redirect_dir for renaming a merge directory +_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir -o redirect_dir=on FILES="dir file symlink chrdev blkdev fifo socket" @@ -150,13 +153,13 @@ check_inode_numbers $testdir $tmp.after_copyup $tmp.after_move # Verify that the inode numbers survive a mount cycle $UMOUNT_PROG $SCRATCH_MNT -_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir +_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir -o redirect_dir=on # Compare inode numbers before/after mount cycle check_inode_numbers $testdir $tmp.after_move $tmp.after_cycle # check overlayfs -_overlay_check_scratch_dirs $lowerdir $upperdir $workdir +_overlay_check_scratch_dirs $lowerdir $upperdir $workdir -o redirect_dir=on echo "Silence is golden" status=0