overlay/029: fix test failure with nfs_export feature enabled

[xfstests-dev.git] / tests / overlay / 029

diff --git a/tests/overlay/029 b/tests/overlay/029
index 1d2d20929c4965595bd1d816c910afe9e618fd9e..17f58de77aded00db319210489db23ab0ef6b0fd 100755 (executable)
--- a/tests/overlay/029
+++ b/tests/overlay/029
@@ -68,12 +68,18 @@ _overlay_mount_dirs $SCRATCH_MNT/up $tmp/{upper,work} \
 cat $tmp/mnt/foo
 $UMOUNT_PROG $tmp/mnt
 
 cat $tmp/mnt/foo
 $UMOUNT_PROG $tmp/mnt
 

+# re-create upper/work to avoid ovl_verify_origin() mount failure
+# when index is enabled
+rm -rf $tmp/{upper,work}
+mkdir -p $tmp/{upper,work}

 # mount overlay again using lower dir from SCRATCH_MNT dir
 _overlay_mount_dirs $SCRATCH_MNT/low $tmp/{upper,work} \
   overlay $tmp/mnt
 cat $tmp/mnt/bar
 $UMOUNT_PROG $tmp/mnt
 
 # mount overlay again using lower dir from SCRATCH_MNT dir
 _overlay_mount_dirs $SCRATCH_MNT/low $tmp/{upper,work} \
   overlay $tmp/mnt
 cat $tmp/mnt/bar
 $UMOUNT_PROG $tmp/mnt
 

+rm -rf $tmp/{upper,work}
+mkdir -p $tmp/{upper,work}

 # mount overlay again using SCRATCH_MNT dir
 _overlay_mount_dirs $SCRATCH_MNT/ $tmp/{upper,work} \
   overlay $tmp/mnt
 # mount overlay again using SCRATCH_MNT dir
 _overlay_mount_dirs $SCRATCH_MNT/ $tmp/{upper,work} \
   overlay $tmp/mnt