[1/4] ovelray: drop explicit use of OVERLAY_MOUNT_OPTIONS

Commit Message

Amir Goldstein Jan. 26, 2018, 7:59 a.m. UTC

Tests don't need to specify $OVERLAY_MOUNT_OPTIONS for overlay mount
helpers. These options have already been assigned to MOUNT_OPTIONS by
_overlay_config_override or by _mount_opts and will be added to mount
command by _common_dev_mount_options in _overlay_mount_dirs.

Signed-off-by: Amir Goldstein <[e-mail]>
---
 tests/overlay/041 | 6 ++----
 tests/overlay/043 | 6 ++----
 tests/overlay/044 | 7 ++-----
 3 files changed, 6 insertions(+), 13 deletions(-)

Patch

diff --git a/tests/overlay/041 b/tests/overlay/041
index 4152107..11efacb 100755
--- a/tests/overlay/041
+++ b/tests/overlay/041
@@ -68,8 +68,7 @@  _scratch_mkfs
 upperdir=$OVL_BASE_SCRATCH_MNT/$OVL_UPPER
 workdir=$OVL_BASE_SCRATCH_MNT/$OVL_WORK
 
-_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir \
-			$OVERLAY_MOUNT_OPTIONS
+_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir
 
 test_dir=$SCRATCH_MNT/test_dir/
 
@@ -185,8 +184,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_MOUNT_OPTIONS
+_overlay_scratch_mount_dirs $middir:$lowerdir $upperdir $workdir
 
 # Copy up test_dir
 touch $test_dir/test_file
diff --git a/tests/overlay/043 b/tests/overlay/043
index 858b6a9..699c4e1 100755
--- a/tests/overlay/043
+++ b/tests/overlay/043
@@ -81,8 +81,7 @@  _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 \
-			    $OVERLAY_MOUNT_OPTIONS
+_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir
 
 FILES="dir file symlink chrdev blkdev fifo socket"
 
@@ -149,8 +148,7 @@  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_MOUNT_OPTIONS
+_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir
 
 # Compare inode numbers before/after mount cycle
 check_inode_numbers $testdir $tmp.after_move $tmp.after_cycle
diff --git a/tests/overlay/044 b/tests/overlay/044
index 9c0ff04..e57f6f7 100755
--- a/tests/overlay/044
+++ b/tests/overlay/044
@@ -98,9 +98,7 @@  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_MOUNT_OPTIONS="${OVERLAY_MOUNT_OPTIONS} -o index=on"
-_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir \
-			    $OVERLAY_MOUNT_OPTIONS
+_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir -o index=on
 
 rm -f $tmp.*
 
@@ -124,8 +122,7 @@  check_ino_nlink $SCRATCH_MNT $tmp.before $tmp.after_one
 
 # Verify that the hardlinks survive a mount cycle
 $UMOUNT_PROG $SCRATCH_MNT
-_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir \
-			    $OVERLAY_MOUNT_OPTIONS
+_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir -o index=on
 
 echo "== After mount cycle =="
 cat $FILES