From patchwork Fri Jan 26 07:59:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 10185231 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 7EBFF60383 for ; Fri, 26 Jan 2018 07:58:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 72B87290E8 for ; Fri, 26 Jan 2018 07:58:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 67394290EC; Fri, 26 Jan 2018 07:58:12 +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 F2520290E8 for ; Fri, 26 Jan 2018 07:58:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752111AbeAZH6L (ORCPT ); Fri, 26 Jan 2018 02:58:11 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:42101 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751920AbeAZH6K (ORCPT ); Fri, 26 Jan 2018 02:58:10 -0500 Received: by mail-wm0-f68.google.com with SMTP id r71so19308792wmd.1; Thu, 25 Jan 2018 23:58:09 -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=Y6r5J7k/7jkVNOkCenbd+ryyA7qeCsE0D+4WscMdftw=; b=Srizp8OtmpBEQdCbWDkdxoAqP0JB9HomdBFSgj/bfFvfFPuQb2p3wdy7AeZc+8mpQD muT/pXaA2U+CPEuInOCPypr9EPApfoHduL9LLE5AxdlyDwdLpZ3gyWTAApsNgNbytP+c 9nzJZT1J8o3tAXuPEfa6FyNOtsjHi9N4nizy7La5Rxq6Wd4s/kMF13ioRweMzGbahh18 64vAYVzcZ6C0T2fMhZPiV/ztFCIju0lkLcQFsoeidQjXLBAaR5MAxwvzubg6NIKYxzhW brW3iJUlgxZ6AcCE6TsUfayK5Sdovcfa0CrVHRyk3wgAoNVGC6+o9W91kqGFckco2PH9 q3ng== 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=Y6r5J7k/7jkVNOkCenbd+ryyA7qeCsE0D+4WscMdftw=; b=p1ydhPrAC+wggA2I2qKM0dxZ31K54NNtCsla2gT4KNz2pGPFfnfkKIs/xRpD1TBxa7 76ODk+euVqOD5G788OVWcJ1ZYZR5KAJhLCWhl+pNhJf1uvkQX8Y2WUjkQ/BinB8Et2T/ RlsXzaxt2Fo4UQHrWPYCuLaXSsyuqmdiJmgvoov8N5uA3YcnzdlqsQPoV1ucCsSD9RKK iFbE0uFjFTHMyekue28DhXm2tsaWdH5hedqfO7ddPM4ztlXQXmOUov0sucR//H3V3nx/ J7pG+4d9Aao5PQYPCD7bnjLQPJQx57H15PmUEe7TM3ow+f1RniCCu6h3aqe9NPeGXxXp /yxQ== X-Gm-Message-State: AKwxytemKqJizvHvlUGXuxBpEVcRDNIjHj16plN41z3NmipVEQKbSaVC N7HrKDqVwYngcJTFcMCGTE5m/w== X-Google-Smtp-Source: AH8x227BfimcZohxezTpa4AZbiS4Ur4qhERkCO3LC0DiGexbqAT+J2F3sFIh5CXQ+3nCTwy+ZgIkYg== X-Received: by 10.28.180.4 with SMTP id d4mr10832153wmf.13.1516953489109; Thu, 25 Jan 2018 23:58:09 -0800 (PST) Received: from localhost.localdomain ([141.226.162.233]) by smtp.gmail.com with ESMTPSA id 44sm10088261wrv.0.2018.01.25.23.58.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 25 Jan 2018 23:58:08 -0800 (PST) From: Amir Goldstein To: Eryu Guan Cc: zhangyi , Miklos Szeredi , linux-unionfs@vger.kernel.org, fstests@vger.kernel.org Subject: [PATCH 1/4] ovelray: drop explicit use of OVERLAY_MOUNT_OPTIONS Date: Fri, 26 Jan 2018 09:59:05 +0200 Message-Id: <1516953548-15679-2-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 Tests don't need to specify $OVERLAY_MOUNT_OPTIONS for overlay mount helpers. These options have already been assigned to MOUNT_OPTIONS by _overlay_config_override or by _mount_opts and will be added to mount command by _common_dev_mount_options in _overlay_mount_dirs. Signed-off-by: Amir Goldstein --- tests/overlay/041 | 6 ++---- tests/overlay/043 | 6 ++---- tests/overlay/044 | 7 ++----- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/tests/overlay/041 b/tests/overlay/041 index 4152107..11efacb 100755 --- a/tests/overlay/041 +++ b/tests/overlay/041 @@ -68,8 +68,7 @@ _scratch_mkfs upperdir=$OVL_BASE_SCRATCH_MNT/$OVL_UPPER workdir=$OVL_BASE_SCRATCH_MNT/$OVL_WORK -_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir \ - $OVERLAY_MOUNT_OPTIONS +_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir test_dir=$SCRATCH_MNT/test_dir/ @@ -185,8 +184,7 @@ _scratch_mkfs upperdir=$OVL_BASE_SCRATCH_MNT/ovl-upper workdir=$OVL_BASE_SCRATCH_MNT/ovl-work -_overlay_scratch_mount_dirs $middir:$lowerdir $upperdir $workdir \ - $OVERLAY_MOUNT_OPTIONS +_overlay_scratch_mount_dirs $middir:$lowerdir $upperdir $workdir # Copy up test_dir touch $test_dir/test_file diff --git a/tests/overlay/043 b/tests/overlay/043 index 858b6a9..699c4e1 100755 --- a/tests/overlay/043 +++ b/tests/overlay/043 @@ -81,8 +81,7 @@ _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 \ - $OVERLAY_MOUNT_OPTIONS +_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir FILES="dir file symlink chrdev blkdev fifo socket" @@ -149,8 +148,7 @@ 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_MOUNT_OPTIONS +_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir # Compare inode numbers before/after mount cycle check_inode_numbers $testdir $tmp.after_move $tmp.after_cycle diff --git a/tests/overlay/044 b/tests/overlay/044 index 9c0ff04..e57f6f7 100755 --- a/tests/overlay/044 +++ b/tests/overlay/044 @@ -98,9 +98,7 @@ upperdir=$OVL_BASE_SCRATCH_MNT/$OVL_UPPER workdir=$OVL_BASE_SCRATCH_MNT/$OVL_WORK # Enable overlay index feature to prevent breaking hardlinks on copy up -OVERLAY_MOUNT_OPTIONS="${OVERLAY_MOUNT_OPTIONS} -o index=on" -_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir \ - $OVERLAY_MOUNT_OPTIONS +_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir -o index=on rm -f $tmp.* @@ -124,8 +122,7 @@ check_ino_nlink $SCRATCH_MNT $tmp.before $tmp.after_one # Verify that the hardlinks survive a mount cycle $UMOUNT_PROG $SCRATCH_MNT -_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir \ - $OVERLAY_MOUNT_OPTIONS +_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir -o index=on echo "== After mount cycle ==" cat $FILES