From: Amir Goldstein Date: Wed, 6 Dec 2023 12:18:57 +0000 (+0200) Subject: overlay: create helper _overlay_scratch_mount_opts() X-Git-Tag: v2024.01.14~15 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a5c3a12796cf965ccd5b87d4cff653c4350076ae;p=xfstests-dev.git overlay: create helper _overlay_scratch_mount_opts() The new overlayfs mount options lowerdir+,datadir+ don't fit well into any of the existing _overlay_scratch_mount* helpers. Add this new helper to reduce a common pattern of custom mount options. Suggested-by: Zorro Lang Signed-off-by: Amir Goldstein Reviewed-by: Zorro Lang Signed-off-by: Zorro Lang --- diff --git a/common/overlay b/common/overlay index ea1eb7b1..faa9339a 100644 --- a/common/overlay +++ b/common/overlay @@ -32,6 +32,12 @@ _overlay_mount_dirs() $MOUNT_PROG -t overlay $diropts `_common_dev_mount_options $*` } +# Mount with mnt/dev of scratch mount and custom mount options +_overlay_scratch_mount_opts() +{ + $MOUNT_PROG -t overlay $OVL_BASE_SCRATCH_MNT $SCRATCH_MNT $* +} + # Mount with same options/mnt/dev of scratch mount, but optionally # with different lower/upper/work dirs _overlay_scratch_mount_dirs() @@ -254,7 +260,7 @@ _require_scratch_overlay_lowerdir_add_layers() local datadir="$OVL_BASE_SCRATCH_MNT/$OVL_LOWER" _scratch_mkfs > /dev/null 2>&1 - $MOUNT_PROG -t overlay $OVL_BASE_SCRATCH_MNT $SCRATCH_MNT \ + _overlay_scratch_mount_opts \ -o"lowerdir+=$lowerdir,datadir+=$datadir" \ -o"redirect_dir=follow,metacopy=on" > /dev/null 2>&1 || \ _notrun "overlay lowerdir+,datadir+ not supported on ${SCRATCH_DEV}" diff --git a/tests/overlay/011 b/tests/overlay/011 index 20812d88..09a950ba 100755 --- a/tests/overlay/011 +++ b/tests/overlay/011 @@ -37,7 +37,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 +_overlay_scratch_mount_opts -o ro -o lowerdir=$upperdir:$lowerdir # 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 8cd76979..f4c981ad 100755 --- a/tests/overlay/035 +++ b/tests/overlay/035 @@ -42,8 +42,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" \ - $OVL_BASE_SCRATCH_MNT $SCRATCH_MNT +_overlay_scratch_mount_opts -o"lowerdir=$lowerdir2:$lowerdir1" touch $SCRATCH_MNT/foo 2>&1 | _filter_scratch $MOUNT_PROG -o remount,rw $SCRATCH_MNT 2>&1 | _filter_ro_mount $UMOUNT_PROG $SCRATCH_MNT diff --git a/tests/overlay/052 b/tests/overlay/052 index da8c645b..6abe2e01 100755 --- a/tests/overlay/052 +++ b/tests/overlay/052 @@ -133,7 +133,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 \ +_overlay_scratch_mount_opts \ -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 @@ -144,7 +144,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 \ +_overlay_scratch_mount_opts \ -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 dfa29d01..cf94f930 100755 --- a/tests/overlay/053 +++ b/tests/overlay/053 @@ -162,7 +162,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 \ +_overlay_scratch_mount_opts \ -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 @@ -173,7 +173,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 \ +_overlay_scratch_mount_opts \ -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 04e13e46..a4e9560a 100755 --- a/tests/overlay/062 +++ b/tests/overlay/062 @@ -65,7 +65,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 \ +_overlay_scratch_mount_opts \ -o ro,redirect_dir=nofollow,nfs_export=on,lowerdir=$lower:$lower2 # Decode an overlay directory file handle, whose underlying lower dir dentry diff --git a/tests/overlay/079 b/tests/overlay/079 index 078ee816..f28fc313 100755 --- a/tests/overlay/079 +++ b/tests/overlay/079 @@ -141,7 +141,7 @@ mount_overlay() { local _lowerdir=$1 _datadir2=$2 _datadir=$3 - $MOUNT_PROG -t overlay $OVL_BASE_SCRATCH_MNT $SCRATCH_MNT \ + _overlay_scratch_mount_opts \ -o"lowerdir=$_lowerdir::$_datadir2::$_datadir" \ -o"upperdir=$upperdir,workdir=$workdir" \ -o redirect_dir=on,metacopy=on @@ -151,7 +151,7 @@ mount_ro_overlay() { local _lowerdir=$1 _datadir2=$2 _datadir=$3 - $MOUNT_PROG -t overlay $OVL_BASE_SCRATCH_MNT $SCRATCH_MNT \ + _overlay_scratch_mount_opts \ -o"lowerdir=$_lowerdir::$_datadir2::$_datadir" \ -o redirect_dir=follow,metacopy=on } diff --git a/tests/overlay/085 b/tests/overlay/085 index 07a32c24..0f4e4b06 100755 --- a/tests/overlay/085 +++ b/tests/overlay/085 @@ -142,7 +142,7 @@ mount_overlay() { local _lowerdir=$1 _datadir2=$2 _datadir=$3 - $MOUNT_PROG -t overlay $OVL_BASE_SCRATCH_MNT $SCRATCH_MNT \ + _overlay_scratch_mount_opts \ -o"lowerdir+=$_lowerdir,datadir+=$_datadir2,datadir+=$_datadir" \ -o"upperdir=$upperdir,workdir=$workdir" \ -o redirect_dir=on,metacopy=on @@ -152,7 +152,7 @@ mount_ro_overlay() { local _lowerdir=$1 _datadir2=$2 _datadir=$3 - $MOUNT_PROG -t overlay $OVL_BASE_SCRATCH_MNT $SCRATCH_MNT \ + _overlay_scratch_mount_opts \ -o"lowerdir+=$_lowerdir,datadir+=$_datadir2,datadir+=$_datadir" \ -o redirect_dir=follow,metacopy=on }