On Wed, Sep 27, 2017 at 10:04:10AM +0300, Amir Goldstein wrote: > Tests that use _overlay_mount_dirs() should also use the > default overlay mount options. > Move mount options from overlay_mount() into _overlay_mount_dirs() > and use helper common_dev_mount_opts() to get options. > > OVERLAY_MOUNT_OPTIONS is assigned to MOUNT_OPTIONS, so > there is no need to use OVERLAY_MOUNT_OPTIONS directly. Agreed, all the fs-specific mount options should be assigned to MOUNT_OPTIONS in common/config at test init time, if MOUNT_OPTIONS is not specified. We should always use MOUNT_OPTIONS or TEST_FS_MOUNT_OPTS in other places. Thanks, Eryu > > Signed-off-by: Amir Goldstein <amir73il@xxxxxxxxx> > > Use common_dev_mount_opts in _overlay_mount_dirs() > --- > common/rc | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/common/rc b/common/rc > index 1a61549..b30c4b9 100644 > --- a/common/rc > +++ b/common/rc > @@ -342,7 +342,7 @@ _overlay_mount_dirs() > shift 3 > > $MOUNT_PROG -t overlay -o lowerdir=$lowerdir -o upperdir=$upperdir \ > - -o workdir=$workdir $* > + -o workdir=$workdir `_common_dev_mount_options $*` > } > > _overlay_mkdirs() > @@ -367,9 +367,8 @@ _overlay_mount() > > _overlay_mkdirs $dir > > - _overlay_mount_dirs $dir/$OVL_LOWER $dir/$OVL_UPPER \ > - $dir/$OVL_WORK $OVERLAY_MOUNT_OPTIONS \ > - $SELINUX_MOUNT_OPTIONS $* $dir $mnt > + _overlay_mount_dirs $dir/$OVL_LOWER $dir/$OVL_UPPER $dir/$OVL_WORK \ > + $* $dir $mnt > } > > _overlay_base_test_mount() > -- > 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
