From patchwork Wed Sep 27 07:04:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 9973231 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 944AF6037F for ; Wed, 27 Sep 2017 07:03:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8998429057 for ; Wed, 27 Sep 2017 07:03:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7EAC4290CC; Wed, 27 Sep 2017 07:03:48 +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.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, 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 266FC29057 for ; Wed, 27 Sep 2017 07:03:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752069AbdI0HDr (ORCPT ); Wed, 27 Sep 2017 03:03:47 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:34854 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751866AbdI0HDn (ORCPT ); Wed, 27 Sep 2017 03:03:43 -0400 Received: by mail-wm0-f67.google.com with SMTP id e64so10629459wmi.2; Wed, 27 Sep 2017 00:03:42 -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=9CWiKmzmPj0O6EP+TpAmoXRz9FUhcYUIgBmIdAmAqPk=; b=JtAU33QMWA1MzG4oxFvoPCYL4iioyw+UJkdrRd01Z1b00V9P0wwAjWvaZmMvoNcxEs c+ocH2P4OBi2sERm+Ot0nFpsf7bCflsJuIjnc1oEhzwfc5+JSH8wTX1915878AcmnwMN MSbBnZdr4MGMIb1nj+tyWk3EpkJWEPRhvwYljavHnXvjLea8MXHKr420IXWM4eBwy+gN w36tQaZVo2Ss3g3rWn2gVgDMcwebQBFfOYCBMPCbenzdNupugqd6QlJN9Ca4tZSuXU/b 6UwPBybg5EcN97g0XdBCZpzkQsM4SRWdjQbXif9Uf8k+aN+wXnXoJcL7iUXNF7sLvyfM xbCQ== 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=9CWiKmzmPj0O6EP+TpAmoXRz9FUhcYUIgBmIdAmAqPk=; b=nhpROpQVZVvrKs/37OPgl1HZkfvb4jr0T+OT2lUe81rIn0tnh61tGn7cYNfMnPSige h7VLtggXsAM7HWu/GTpKcFWJYLQRwCGPzJNIRKgqJplWYI1D9d+4HkW2LLH71lRCnekQ /oIbEbJi7otYfuh38AQFrmtnfpWa8zDYMrPl1Kdi76XxAS6wHm6F80A9bPc9MEkr/9qI 8BVsPfKn2LXSuIe4KjPZJPhbIvgonKIs/vDWHI8ehcrpAy19kxqw5L5AOJfaqPWd2RnQ 7br7Y6qnP4bVcC0l784G+at3TxtekjafGg2zfde6XVKfo2Tokis+M0bT77FoEnWO7r9r EMxQ== X-Gm-Message-State: AHPjjUiGe8VbMxZaSR12QHZoceoHm+glh0VwvtEwAWdhIqlb/oxU2Y99 vedrbBCeF0iZ/XDNvtTFJ6SNpQ== X-Google-Smtp-Source: AOwi7QBRiUKTPtNQaDfaUdyCHVgeSgQlJ22vARuKoTuwUw1xgaql0BdG89CAnps6xt3TP0NuphX52g== X-Received: by 10.28.60.8 with SMTP id j8mr559558wma.16.1506495822300; Wed, 27 Sep 2017 00:03:42 -0700 (PDT) Received: from localhost.localdomain (bzq-166-168-31-246.red.bezeqint.net. [31.168.166.246]) by smtp.gmail.com with ESMTPSA id m4sm9239535wrb.35.2017.09.27.00.03.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 27 Sep 2017 00:03:41 -0700 (PDT) From: Amir Goldstein To: Eryu Guan Cc: Miklos Szeredi , linux-unionfs@vger.kernel.org, fstests@vger.kernel.org Subject: [PATCH 2/4] overlay: use default overlay mount options _overlay_mount_dirs() Date: Wed, 27 Sep 2017 10:04:10 +0300 Message-Id: <1506495852-7295-3-git-send-email-amir73il@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1506495852-7295-1-git-send-email-amir73il@gmail.com> References: <1506495852-7295-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 that use _overlay_mount_dirs() should also use the default overlay mount options. Move mount options from overlay_mount() into _overlay_mount_dirs() and use helper common_dev_mount_opts() to get options. OVERLAY_MOUNT_OPTIONS is assigned to MOUNT_OPTIONS, so there is no need to use OVERLAY_MOUNT_OPTIONS directly. Signed-off-by: Amir Goldstein Use common_dev_mount_opts in _overlay_mount_dirs() --- common/rc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/common/rc b/common/rc index 1a61549..b30c4b9 100644 --- a/common/rc +++ b/common/rc @@ -342,7 +342,7 @@ _overlay_mount_dirs() shift 3 $MOUNT_PROG -t overlay -o lowerdir=$lowerdir -o upperdir=$upperdir \ - -o workdir=$workdir $* + -o workdir=$workdir `_common_dev_mount_options $*` } _overlay_mkdirs() @@ -367,9 +367,8 @@ _overlay_mount() _overlay_mkdirs $dir - _overlay_mount_dirs $dir/$OVL_LOWER $dir/$OVL_UPPER \ - $dir/$OVL_WORK $OVERLAY_MOUNT_OPTIONS \ - $SELINUX_MOUNT_OPTIONS $* $dir $mnt + _overlay_mount_dirs $dir/$OVL_LOWER $dir/$OVL_UPPER $dir/$OVL_WORK \ + $* $dir $mnt } _overlay_base_test_mount()