apfs/apfstests
0
0
Fork 0
mirror of https://github.com/linux-apfs/apfstests.git synced 2026-05-01 15:01:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

ovelray: drop explicit use of OVERLAY_MOUNT_OPTIONS

Browse Source 
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 <amir73il@gmail.com>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
This commit is contained in:
Amir Goldstein
2018-01-26 09:59:05 +02:00
committed by Eryu Guan
parent dae4fcad54
commit aee21da0fd
3 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/overlay/041
+2 -4
View File
@@ -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
tests/overlay/043
+2 -4
View File
@@ -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
tests/overlay/044
+2 -5
View File
@@ -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