All of lore.kernel.org
 help / color / mirror / Atom feed
From: Amir Goldstein <amir73il@gmail.com>
To: Eryu Guan <eguan@redhat.com>
Cc: Miklos Szeredi <miklos@szeredi.hu>,
	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	[thread overview]
Message-ID: <1524722007-30891-3-git-send-email-amir73il@gmail.com> (raw)
In-Reply-To: <1524722007-30891-1-git-send-email-amir73il@gmail.com>

_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 <amir73il@gmail.com>
---
 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
-- 
2.7.4

  parent reply	other threads:[~2018-04-26  5:53 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-26  5:53 [PATCH v2 0/4] Fix failing overlay nonsamefs fstests Amir Goldstein
2018-04-26  5:53 ` [PATCH v2 1/4] common/rc: factor out _require_scratch_fs_option Amir Goldstein
2018-04-26  5:53 ` Amir Goldstein [this message]
2018-04-26  5:53 ` [PATCH v2 3/4] overlay/043: require and enable redirect_dir Amir Goldstein
2018-04-26  5:53 ` [PATCH v2 4/4] overlay/04{1,3,4}: enable xino feature Amir Goldstein
2018-04-27  2:43   ` Eryu Guan
2018-04-27  2:31 ` [PATCH v2 0/4] Fix failing overlay nonsamefs fstests Eryu Guan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1524722007-30891-3-git-send-email-amir73il@gmail.com \
    --to=amir73il@gmail.com \
    --cc=eguan@redhat.com \
    --cc=fstests@vger.kernel.org \
    --cc=linux-unionfs@vger.kernel.org \
    --cc=miklos@szeredi.hu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.