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@xxxxxxxxxx>
---
No update in v2.
common/rc | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/common/rc b/common/rc
index 5135260..75d1582 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
--
To unsubscribe from this list: send the line "unsubscribe fstests" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
