From: Amir Goldstein Date: Tue, 11 Jul 2017 19:52:03 +0000 (+0300) Subject: overlay/014: fix test with inodes index enabled X-Git-Tag: v2022.05.01~1970 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=eedff777a09803c82cb1ff996b5f449bcf02311f;p=xfstests-dev.git overlay/014: fix test with inodes index enabled When overlayfs is configured with CONFIG_OVERLAY_FS_INDEX=y, workdir from previous overlay mount cannot be reused in a new overlay mount that uses a different upper dir. Fix the test to use a different workdir when mounting with a different upper dir. This change has not effect on older kernels and overlay configured without CONFIG_OVERLAY_FS_INDEX. Signed-off-by: Amir Goldstein Reviewed-by: Eryu Guan Signed-off-by: Eryu Guan --- diff --git a/tests/overlay/014 b/tests/overlay/014 index 40d10f5e..f228b157 100755 --- a/tests/overlay/014 +++ b/tests/overlay/014 @@ -63,12 +63,17 @@ lowerdir1=$OVL_BASE_SCRATCH_MNT/lower1 lowerdir2=$OVL_BASE_SCRATCH_MNT/lower2 upperdir=$OVL_BASE_SCRATCH_MNT/upper workdir=$OVL_BASE_SCRATCH_MNT/workdir -mkdir -p $lowerdir1 $lowerdir2 $upperdir $workdir +# When overlay inode index feature is enabled, using an upper layer path and/or +# a workdir path that are already used by another overlay mount is not allowed +# and will fail with EBUSY, so create another workdir for the second overlay +# mount +workdir2=$OVL_BASE_SCRATCH_MNT/workdir2 +mkdir -p $lowerdir1 $lowerdir2 $upperdir $workdir $workdir2 mkdir -p $lowerdir1/testdir/d # mount overlay with $lowerdir2 as upperdir, and remove & recreate testdir, # make testdir on $lowerdir2 opaque -_overlay_mount_dirs $lowerdir1 $lowerdir2 $workdir $OVL_BASE_SCRATCH_MNT $SCRATCH_MNT +_overlay_mount_dirs $lowerdir1 $lowerdir2 $workdir2 $OVL_BASE_SCRATCH_MNT $SCRATCH_MNT rm -rf $SCRATCH_MNT/testdir mkdir -p $SCRATCH_MNT/testdir/visibledir # unmount overlayfs but not base fs