These tests check for constant inode number on copy up with nonsamefs layer configuration. This problem is fixes only when opting-in with the xino=on mount option, so let the tests enable the mount option on new kernels and notrun on old kernels. Signed-off-by: Amir Goldstein <amir73il@xxxxxxxxx> --- tests/overlay/041 | 15 +++++++++++---- tests/overlay/043 | 13 ++++++++++--- tests/overlay/044 | 15 +++++++++++---- 3 files changed, 32 insertions(+), 11 deletions(-) diff --git a/tests/overlay/041 b/tests/overlay/041 index 4e72348..9de61f7 100755 --- a/tests/overlay/041 +++ b/tests/overlay/041 @@ -70,7 +70,14 @@ _scratch_mkfs upperdir=$OVL_BASE_SCRATCH_MNT/$OVL_UPPER workdir=$OVL_BASE_SCRATCH_MNT/$OVL_WORK -_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir +# enabling xino in this test requires that base filesystem inode numbers will +# not use bit 63 in inode number of the test files, because bit 63 is used by +# overlayfs to indicate the layer. Let's just assume that this is true for all +# tested filesystems and if we are wrong, the test may fail +_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir -o xino=on || + _notrun "mount overlay with xino failed" +_check_scratch_fs_option "xino" || \ + _notrun "faild to enable xino" test_dir=$SCRATCH_MNT/test_dir/ @@ -171,7 +178,7 @@ subdir_d=$($here/src/t_dir_type $pure_lower_dir $pure_lower_subdir_st_ino) _scratch_unmount # check overlayfs -_overlay_check_scratch_dirs $lowerdir $upperdir $workdir +_overlay_check_scratch_dirs $lowerdir $upperdir $workdir -o xino=on # Verify pure lower residing in dir which has another lower layer middir=$OVL_BASE_TEST_DIR/$seq-ovl-mid @@ -189,7 +196,7 @@ _scratch_mkfs upperdir=$OVL_BASE_SCRATCH_MNT/ovl-upper workdir=$OVL_BASE_SCRATCH_MNT/ovl-work -_overlay_scratch_mount_dirs $middir:$lowerdir $upperdir $workdir +_overlay_scratch_mount_dirs $middir:$lowerdir $upperdir $workdir -o xino=on # Copy up test_dir touch $test_dir/test_file @@ -212,7 +219,7 @@ subdir_d=$($here/src/t_dir_type $pure_lower_dir $pure_lower_subdir_st_ino) echo "Pure lower in dir which has another lower layer: Invalid d_ino reported for subdir" # check overlayfs -_overlay_check_scratch_dirs "$middir:$lowerdir" $upperdir $workdir +_overlay_check_scratch_dirs "$middir:$lowerdir" $upperdir $workdir -o xino=on echo "Silence is golden" status=0 diff --git a/tests/overlay/043 b/tests/overlay/043 index 46df686..66771c0 100755 --- a/tests/overlay/043 +++ b/tests/overlay/043 @@ -83,7 +83,14 @@ _scratch_mkfs >>$seqres.full 2>&1 upperdir=$OVL_BASE_SCRATCH_MNT/$OVL_UPPER workdir=$OVL_BASE_SCRATCH_MNT/$OVL_WORK -_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir +# enabling xino in this test requires that base filesystem inode numbers will +# not use bit 63 in inode number of the test files, because bit 63 is used by +# overlayfs to indicate the layer. Let's just assume that this is true for all +# tested filesystems and if we are wrong, the test may fail +_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir -o xino=on || \ + _notrun "mount overlay with xino failed" +_check_scratch_fs_option "xino" || \ + _notrun "faild to enable xino" FILES="dir file symlink chrdev blkdev fifo socket" @@ -150,13 +157,13 @@ check_inode_numbers $testdir $tmp.after_copyup $tmp.after_move # Verify that the inode numbers survive a mount cycle $UMOUNT_PROG $SCRATCH_MNT -_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir +_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir -o xino=on # Compare inode numbers before/after mount cycle check_inode_numbers $testdir $tmp.after_move $tmp.after_cycle # check overlayfs -_overlay_check_scratch_dirs $lowerdir $upperdir $workdir +_overlay_check_scratch_dirs $lowerdir $upperdir $workdir -o xino=on echo "Silence is golden" status=0 diff --git a/tests/overlay/044 b/tests/overlay/044 index 2ab3035..0e74128 100755 --- a/tests/overlay/044 +++ b/tests/overlay/044 @@ -99,8 +99,15 @@ _scratch_mkfs >>$seqres.full 2>&1 upperdir=$OVL_BASE_SCRATCH_MNT/$OVL_UPPER workdir=$OVL_BASE_SCRATCH_MNT/$OVL_WORK -# Enable overlay index feature to prevent breaking hardlinks on copy up -_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir -o index=on +# Enable overlay index feature to prevent breaking hardlinks on copy up. +# enabling xino in this test requires that base filesystem inode numbers will +# not use bit 63 in inode number of the test files, because bit 63 is used by +# overlayfs to indicate the layer. Let's just assume that this is true for all +# tested filesystems and if we are wrong, the test may fail +_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir -o index=on,xino=on || \ + _notrun "mount overlay with xino failed" +_check_scratch_fs_option "xino" || \ + _notrun "faild to enable xino" rm -f $tmp.* @@ -124,8 +131,8 @@ check_ino_nlink $SCRATCH_MNT $tmp.before $tmp.after_one # Verify that the hardlinks survive a mount cycle $UMOUNT_PROG $SCRATCH_MNT -_overlay_check_scratch_dirs $lowerdir $upperdir $workdir -o index=on -_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir -o index=on +_overlay_check_scratch_dirs $lowerdir $upperdir $workdir -o index=on,xino=on +_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir -o index=on,xino=on echo "== After mount cycle ==" cat $FILES -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-unionfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
