From patchwork Thu Apr 26 05:53:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 10364649 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 EDA26602DC for ; Thu, 26 Apr 2018 05:52:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DF0B12868D for ; Thu, 26 Apr 2018 05:52:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D3C572900D; Thu, 26 Apr 2018 05:52:08 +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 8018D2868D for ; Thu, 26 Apr 2018 05:52:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752785AbeDZFwH (ORCPT ); Thu, 26 Apr 2018 01:52:07 -0400 Received: from mail-io0-f193.google.com ([209.85.223.193]:41374 "EHLO mail-io0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751396AbeDZFwG (ORCPT ); Thu, 26 Apr 2018 01:52:06 -0400 Received: by mail-io0-f193.google.com with SMTP id e12-v6so6626475iob.8; Wed, 25 Apr 2018 22:52:06 -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=5zL8iPRb7lDf2V2RuxJhvxUN/IQZgLAgl4M91QMPUfM=; b=DvTWzlCwn67+gm7ROb5M5uwUH+2yAE5d/Ifc4w5QzJWDTzpzys5HDXfbXwRFq+FW0g MJb3P4p6ac+y7Kwqma0yqhl8Uxhp673a9cmTrqEv/O/n6rJOtSbHcOqk+sHP1Ox3MD5n 2XzGTcwP8YMUuLYB90ut9/yMRdQxTJppgjKYNuNDpnbsYTDfE8fUOqTLQ+xqjc12hTao U+11VLdQdk+ocbAC9ORUcxnX/6f0UkvxDAFVsw6lFdn1LOpNZ/Qkqnkkdu5T43229XgV BMR2kvTcsbkjKjmm/9Ai+JRye6AzGkaxqJPS2IbznCV+HoQaueR7zMT6+VBHq4TQn7DY EfbQ== 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=5zL8iPRb7lDf2V2RuxJhvxUN/IQZgLAgl4M91QMPUfM=; b=Z4a0mC9fKpxTBO5FSfaFYSVju9KUN8atStrXcxk+1kM7wbR3eguu1TybQpku+sCOFX b+YRFIDqBIow1NsvLCRzz+bAzQSQQSBbLInRNwVdHdnu1n4hYGOi0qzvyHR4jNG3wPwO UG9VR8Jn9Wo99zPafkPOXa30/Ayh2xRfFUsEQldF+3nDc2tdPTkVNyZngcqxgA9lrkEY eojZWjOLQ9q9ZFdyk0SgJ34sOzPVDHYYagbzrj7r+RVcW54RvJ386vmumu3TlEJpJ3MT TvmiIR9esGX5TNM33w9qW7cs26FQxPXcQBS54V6QCN3Lx5nfD8nbUdfm5qctkvr7A/O4 rT6w== X-Gm-Message-State: ALQs6tAs7VQu6Of6ZbczsZEggQuM6Buj88I0aw8xlAl6iftf6EroCwrw Ia+F+1kDELleJG4PFxKXSrc= X-Google-Smtp-Source: AIpwx49wgqwyBkHaoGajuVYrrnWYw3HTiLrM2jkoVgAERyPjM4ypeZlYKPbpL2Wg3Co+OVFFNCK9ng== X-Received: by 2002:a6b:2a05:: with SMTP id q5-v6mr34158116ioq.252.1524721925957; Wed, 25 Apr 2018 22:52:05 -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.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 25 Apr 2018 22:52:05 -0700 (PDT) From: Amir Goldstein To: Eryu Guan Cc: Miklos Szeredi , linux-unionfs@vger.kernel.org, fstests@vger.kernel.org Subject: [PATCH v2 2/4] overlay/041: fix call to _overlay_check_scratch_dirs Date: Wed, 25 Apr 2018 23:53:25 -0600 Message-Id: <1524722007-30891-3-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 _overlay_check_scratch_dirs needs to base scratch fs to be mounted, so only unmount overlay before check. Remove redundant definition of upperdir/workdir path, which also uses hardcoded path instead of the config vars OVL_UPPER/OVL_WORK. Signed-off-by: Amir Goldstein --- tests/overlay/041 | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tests/overlay/041 b/tests/overlay/041 index 4e72348..f3be746 100755 --- a/tests/overlay/041 +++ b/tests/overlay/041 @@ -168,7 +168,7 @@ subdir_d=$($here/src/t_dir_type $pure_lower_dir $pure_lower_subdir_st_ino) [[ $subdir_d == "subdir d" ]] || \ echo "Merged dir: Invalid d_ino reported for subdir" -_scratch_unmount +$UMOUNT_PROG $SCRATCH_MNT # check overlayfs _overlay_check_scratch_dirs $lowerdir $upperdir $workdir @@ -186,9 +186,6 @@ mkdir -p $lowerdir/test_dir/pure_lower_dir/subdir _scratch_mkfs -upperdir=$OVL_BASE_SCRATCH_MNT/ovl-upper -workdir=$OVL_BASE_SCRATCH_MNT/ovl-work - _overlay_scratch_mount_dirs $middir:$lowerdir $upperdir $workdir # Copy up test_dir