From: Eryu Guan <eguan@redhat.com>
To: fstests@vger.kernel.org
Cc: linux-unionfs@vger.kernel.org, Eryu Guan <eguan@redhat.com>
Subject: [PATCH 1/2] common: remove all files in $SCRATCH_DEV for overlayfs in _scratch_cleanup_files()
Date: Mon, 11 Jan 2016 19:38:20 +0800 [thread overview]
Message-ID: <1452512301-22145-1-git-send-email-eguan@redhat.com> (raw)
All files in lower/upper dirs should be removed for overlayfs in
_scratch_cleanup_files(), not only files in merged dir, otherwise files
from lower dir won't be removed.
Signed-off-by: Eryu Guan <eguan@redhat.com>
---
common/rc | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/common/rc b/common/rc
index e5ae1d0..e2a32da 100644
--- a/common/rc
+++ b/common/rc
@@ -701,9 +701,17 @@ _mkfs_dev()
# remove all files in $SCRATCH_MNT, useful when testing on NFS/CIFS
_scratch_cleanup_files()
{
- _scratch_mount
- rm -rf $SCRATCH_MNT/*
- _scratch_unmount
+ case $FSTYP in
+ overlay)
+ # $SCRATCH_DEV is a valid directory in overlay case
+ rm -rf $SCRATCH_DEV/*
+ ;;
+ *)
+ _scratch_mount
+ rm -rf $SCRATCH_MNT/*
+ _scratch_unmount
+ ;;
+ esac
}
_scratch_mkfs()
--
1.8.3.1
next reply other threads:[~2016-01-11 11:38 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-11 11:38 Eryu Guan [this message]
2016-01-11 11:38 ` [PATCH 2/2] overlay: test copy up files from lower dir Eryu Guan
2016-01-11 20:31 ` Dave Chinner
2016-01-12 3:46 ` Eryu Guan
2016-01-12 4:06 ` Dave Chinner
2016-01-12 9:34 ` Darrick J. Wong
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=1452512301-22145-1-git-send-email-eguan@redhat.com \
--to=eguan@redhat.com \
--cc=fstests@vger.kernel.org \
--cc=linux-unionfs@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox