Kernel commit c21c839b8448 "ovl: whiteout inode sharing" results in a temp whiteout file resident inside work dir. Test overlay/031 is a regression test for two user visible bugs: 1. Exposed whiteouts in overlay 2. Failure to remove directory It also has a sanity tests for a harmless by-product of the bug - a residue file in work dir. The new temp whiteout file looks like a residue and causes the test to fail. Drop this sanity test, because it is not vital to the regression test. We could also check if the residue is a single whiteout, but that is not really needed, so best not poke into overlay internal work dir. Signed-off-by: Amir Goldstein <amir73il@xxxxxxxxx> --- Eryu, This fixes a failure on overlayfs-next. Test works fine on old kernels after the change of course. Thanks, Amir. tests/overlay/031 | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/overlay/031 b/tests/overlay/031 index 2740c7c3..d7a5adb9 100755 --- a/tests/overlay/031 +++ b/tests/overlay/031 @@ -94,7 +94,6 @@ _overlay_scratch_mount_dirs $lowerdir1 $upperdir $workdir # try to remove test dir from overlay dir, trigger ovl_remove_and_whiteout, # it will not clean up the dir and lead to residue. rm -rf $SCRATCH_MNT/testdir 2>&1 | _filter_scratch -ls $workdir/work $UMOUNT_PROG $SCRATCH_MNT -- 2.17.1
