From patchwork Wed Sep 27 07:04:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 9973229 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 77E296037F for ; Wed, 27 Sep 2017 07:03:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6D003290CB for ; Wed, 27 Sep 2017 07:03:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6165A290D1; Wed, 27 Sep 2017 07:03:46 +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 0AB66290CB for ; Wed, 27 Sep 2017 07:03:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752033AbdI0HDo (ORCPT ); Wed, 27 Sep 2017 03:03:44 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:45527 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751436AbdI0HDm (ORCPT ); Wed, 27 Sep 2017 03:03:42 -0400 Received: by mail-wm0-f65.google.com with SMTP id q124so14541980wmb.0; Wed, 27 Sep 2017 00:03:41 -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=1hS7W79SXqi1B23i84t2lb3IIRqrqtA6cTNE/RPTVR0=; b=GrOq4SsXhHmISA8D2rCz1T3Btib1J64vHDF3QsNLaXjnaEgFbdYqZitYczgRjrdZ5C muVMGjkRN65It/0iQ0kl9h82aufgjKX5Vyr7+PalZHG8TQCH5asZ2eWdowGcyCrxwJHJ GGGEEg3s7H7XjOUYD60AJBoJz4GM6vkwXxHicC/M6GsmewV23mRRUGHb5UOkIeRU0Whd 4nPJvccjoDcJ9vUxwVQ7631njkN0YoixHnAGsz7dRHEzHj4lXhI9kd8bXHDQR4m8WVE1 nbPWx3Ohzzqf3YBRBQ4vIDwcgESih9AFc82raLooa/F1da0cbBgqQPelfl5wtYuAVqzk grDw== 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=1hS7W79SXqi1B23i84t2lb3IIRqrqtA6cTNE/RPTVR0=; b=CKKSIiCd1oVd5gDM1jPvBQZDE2q2fHCto9bOR8USSekUdMwSaaV6QC2JO6Omw1hkDd zP5SX3gP7cTQAJWGdcLEEL9gXcmyHVYSAIXt6sydwOT75jE2WqpaMjWi6krjKHF9Q2yB AwIrD660EwXE1tw3MxVe+QX9PmTiVi7jZapHBIrTP5L3miak01VhHjFMUjwYMcwe0D81 y6aQCn4iAVl7RE1fmk4TwJtA7KmN2lmn+HvtF6G5xaXYN6qGAliY6M7lx1IAFLUXSx7H cNr3ZOLMPR08kUYllSfZuOi/c1gXNkjTMSW+XEa5jiBsCVStSXu8ft7aHQtSntx5QuPD Zzqg== X-Gm-Message-State: AHPjjUjmAfHGM5iesw1B9PEKocgDqXKCamjqfRIu8Rb/FaoSYAgypYfJ 68nDtbzC8ITrXD62CjUnhGo= X-Google-Smtp-Source: AOwi7QBqki0EftXitIk83hTaiGYHHjqSSuTgT7vSYATwlqR5xxAVKutfDUKvA7jnKfpBl9gS+3VkZA== X-Received: by 10.28.72.87 with SMTP id v84mr545530wma.138.1506495821070; Wed, 27 Sep 2017 00:03:41 -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.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 27 Sep 2017 00:03:40 -0700 (PDT) From: Amir Goldstein To: Eryu Guan Cc: Miklos Szeredi , linux-unionfs@vger.kernel.org, fstests@vger.kernel.org Subject: [PATCH 1/4] overlay: remove stale implementation of _scratch_mount_options Date: Wed, 27 Sep 2017 10:04:09 +0300 Message-Id: <1506495852-7295-2-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 _scratch_mount_options() was not implemented correctly for overlayfs and wasn't used by any overlay tests. Signed-off-by: Amir Goldstein --- common/rc | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/common/rc b/common/rc index 53bbb11..1a61549 100644 --- a/common/rc +++ b/common/rc @@ -300,26 +300,10 @@ _common_dev_mount_options() echo $MOUNT_OPTIONS $SELINUX_MOUNT_OPTIONS $* } -_overlay_basic_mount_options() -{ - echo "-o lowerdir=$1/$OVL_LOWER,upperdir=$1/$OVL_UPPER,workdir=$1/$OVL_WORK" -} - -_overlay_mount_options() -{ - echo `_common_dev_mount_options` \ - `_overlay_basic_mount_options $1` \ - $OVERLAY_MOUNT_OPTIONS -} - _scratch_mount_options() { _scratch_options mount - if [ "$FSTYP" == "overlay" ]; then - echo `_overlay_mount_options $OVL_BASE_SCRATCH_MNT` - return 0 - fi echo `_common_dev_mount_options $*` $SCRATCH_OPTIONS \ $SCRATCH_DEV $SCRATCH_MNT }