On Fri, Feb 14, 2020 at 5:18 PM Mauricio Faria de Oliveira <mfo@xxxxxxxxxxxxx> wrote: > > This allows other filesystem types to actually be used in these tests. > > Well, aufs does not support the options used in most of them anyway, > so just let it fail to mount (instead of implementing common helpers > for middle layers.) > > On fuse-overlayfs (coming) the options should be supported/compatible, > and thus just work, so no further changes are needed. > > Suggested-by: Amir Goldstein <amir73il@xxxxxxxxx> > Signed-off-by: Mauricio Faria de Oliveira <mfo@xxxxxxxxxxxxx> I'm fine with this patch, you may add: Reviewed-by: Amir Goldstein <amir73il@xxxxxxxxx> but for aufs testers sake, it would be nicer if you added to those tests: [ "$OVL_FSTYP" != aufs ] || _notrun "This test is not compatible with aufs" Thanks, Amir. > --- > tests/overlay/011 | 2 +- > tests/overlay/035 | 2 +- > tests/overlay/052 | 4 ++-- > tests/overlay/053 | 4 ++-- > tests/overlay/062 | 2 +- > 5 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/tests/overlay/011 b/tests/overlay/011 > index 1d09341b250a..0b39416c9835 100755 > --- a/tests/overlay/011 > +++ b/tests/overlay/011 > @@ -53,7 +53,7 @@ $SETFATTR_PROG -n "trusted.overlay.opaque" -v "y" $upperdir/testdir > # $upperdir overlaid on top of $lowerdir, so that "trusted.overlay.opaque" > # xattr should be honored and should not be listed > # mount readonly, because there's no upper and workdir > -$MOUNT_PROG -t overlay -o ro -o lowerdir=$upperdir:$lowerdir $OVL_BASE_SCRATCH_MNT $SCRATCH_MNT > +$MOUNT_PROG -t $OVL_FSTYP -o ro -o lowerdir=$upperdir:$lowerdir $OVL_BASE_SCRATCH_MNT $SCRATCH_MNT > > # Dump trusted.overlay xattr, we should not see the "opaque" xattr > _getfattr -d -m overlay $SCRATCH_MNT/testdir > diff --git a/tests/overlay/035 b/tests/overlay/035 > index c0aae935bcf1..bbb158f319cd 100755 > --- a/tests/overlay/035 > +++ b/tests/overlay/035 > @@ -52,7 +52,7 @@ mkdir -p $lowerdir1 $lowerdir2 $upperdir $workdir > > # Mount overlay with lower layers only. > # Verify that overlay is mounted read-only and that it cannot be remounted rw. > -$MOUNT_PROG -t overlay -o"lowerdir=$lowerdir2:$lowerdir1" \ > +$MOUNT_PROG -t $OVL_FSTYP -o"lowerdir=$lowerdir2:$lowerdir1" \ > $OVL_BASE_SCRATCH_MNT $SCRATCH_MNT > touch $SCRATCH_MNT/foo 2>&1 | _filter_scratch > $MOUNT_PROG -o remount,rw $SCRATCH_MNT 2>&1 | _filter_ro_mount > diff --git a/tests/overlay/052 b/tests/overlay/052 > index b1cf0da64bbf..35a7b5f1a903 100755 > --- a/tests/overlay/052 > +++ b/tests/overlay/052 > @@ -147,7 +147,7 @@ unmount_dirs > > # Check encode/decode/read of lower file handles on lower layers only r/o overlay. > # For non-upper overlay mount, nfs_export requires disabling redirect_dir. > -$MOUNT_PROG -t overlay $OVL_BASE_SCRATCH_MNT $SCRATCH_MNT \ > +$MOUNT_PROG -t $OVL_FSTYP $OVL_BASE_SCRATCH_MNT $SCRATCH_MNT \ > -o ro,redirect_dir=nofollow,nfs_export=on,lowerdir=$middle:$lower > test_file_handles $SCRATCH_MNT/lowertestdir -rp > test_file_handles $SCRATCH_MNT/lowertestdir/subdir -rp > @@ -158,7 +158,7 @@ unmount_dirs > # Overlay lookup cannot follow the redirect from $upper/lowertestdir.new to > # $lower/lowertestdir. Instead, we mount an overlay subtree rooted at these > # directories. > -$MOUNT_PROG -t overlay $OVL_BASE_SCRATCH_MNT $SCRATCH_MNT \ > +$MOUNT_PROG -t $OVL_FSTYP $OVL_BASE_SCRATCH_MNT $SCRATCH_MNT \ > -o ro,redirect_dir=nofollow,nfs_export=on,lowerdir=$upper/lowertestdir.new:$lower/lowertestdir > test_file_handles $SCRATCH_MNT -r > test_file_handles $SCRATCH_MNT/subdir -rp > diff --git a/tests/overlay/053 b/tests/overlay/053 > index ff95424741ec..5ac19b32c3cb 100755 > --- a/tests/overlay/053 > +++ b/tests/overlay/053 > @@ -169,7 +169,7 @@ unmount_dirs > > # Check encode/decode/read of lower file handles on lower layers only r/o overlay. > # For non-upper overlay mount, nfs_export requires disabling redirect_dir. > -$MOUNT_PROG -t overlay $OVL_BASE_SCRATCH_MNT $SCRATCH_MNT \ > +$MOUNT_PROG -t $OVL_FSTYP $OVL_BASE_SCRATCH_MNT $SCRATCH_MNT \ > -o ro,redirect_dir=nofollow,nfs_export=on,lowerdir=$middle:$lower > test_file_handles $SCRATCH_MNT/lowertestdir -rp > test_file_handles $SCRATCH_MNT/lowertestdir/subdir -rp > @@ -180,7 +180,7 @@ unmount_dirs > # Overlay lookup cannot follow the redirect from $upper/lowertestdir.new to > # $lower/lowertestdir. Instead, we mount an overlay subtree rooted at these > # directories. > -$MOUNT_PROG -t overlay $OVL_BASE_SCRATCH_MNT $SCRATCH_MNT \ > +$MOUNT_PROG -t $OVL_FSTYP $OVL_BASE_SCRATCH_MNT $SCRATCH_MNT \ > -o ro,redirect_dir=nofollow,nfs_export=on,lowerdir=$upper/lowertestdir.new:$lower/lowertestdir > test_file_handles $SCRATCH_MNT -r > test_file_handles $SCRATCH_MNT/subdir -rp > diff --git a/tests/overlay/062 b/tests/overlay/062 > index 2c86a4b6fd1e..afd3562bfd33 100755 > --- a/tests/overlay/062 > +++ b/tests/overlay/062 > @@ -72,7 +72,7 @@ create_test_files $lowertestdir > $MOUNT_PROG --bind $lowertestdir $lowertestdir > > # For non-upper overlay mount, nfs_export requires disabling redirect_dir. > -$MOUNT_PROG -t overlay $OVL_BASE_SCRATCH_MNT $SCRATCH_MNT \ > +$MOUNT_PROG -t $OVL_FSTYP $OVL_BASE_SCRATCH_MNT $SCRATCH_MNT \ > -o ro,redirect_dir=nofollow,nfs_export=on,lowerdir=$lower:$lower2 > > # Decode an overlay directory file handle, whose underlying lower dir dentry > -- > 2.20.1 >
