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

overlay/06[89]: fix test run with nfs_export feature enabled by default

Browse Source 
The tests were checking that nfs_export feature was successfully enabled
by greping for nfs_export=on option in /proc/mounts.

This check was incorrect if the module default was nfs_export enabled
and caused test to not run with the message:
    cannot enable nfs_export feature on nested overlay

Use a helper that checks this condition correctly.

Reported-by: Chengguang Xu <cgxu519@mykernel.net>
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Reviewed-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
This commit is contained in:
Amir Goldstein
2020-04-09 17:09:21 +03:00
committed by Eryu Guan
parent 46adeb1600
commit 200e7d5310
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/overlay
+8 -6
View File
@@ -137,9 +137,11 @@ _overlay_scratch_unmount()
}
# Check that a specific overlayfs feature is supported
__check_scratch_overlay_feature()
_check_overlay_feature()
{
local feature=$1
local dev=$2
local mnt=$3
# overalyfs features (e.g. redirect_dir, index) are
# configurable from Kconfig (the build default), by module
@@ -153,10 +155,10 @@ __check_scratch_overlay_feature()
# index=off if underlying fs does not support file handles.
# Overlayfs only displays mount option if it differs from the default.
# Overlayfs may enable the feature, but fallback to read-only mount.
((( [ "$default" = N ] && _fs_options $SCRATCH_DEV | grep -q "${feature}=on" ) || \
( [ "$default" = Y ] && ! _fs_options $SCRATCH_DEV | grep -q "${feature}=off" )) && \
touch $SCRATCH_MNT/foo 2>/dev/null ) || \
_notrun "${FSTYP} feature '${feature}' cannot be enabled on ${SCRATCH_DEV}"
((( [ "$default" = N ] && _fs_options $dev | grep -q "${feature}=on" ) || \
( [ "$default" = Y ] && ! _fs_options $dev | grep -q "${feature}=off" )) && \
touch $mnt/foo 2>/dev/null ) || \
_notrun "${FSTYP} feature '${feature}' cannot be enabled on ${dev}"
}
# Require a set of overlayfs features
@@ -178,7 +180,7 @@ _require_scratch_overlay_features()
_notrun "overlay features '${features[*]}' cannot be enabled on ${SCRATCH_DEV}"
for feature in ${features[*]}; do
__check_scratch_overlay_feature ${feature}
_check_overlay_feature ${feature} $SCRATCH_DEV $SCRATCH_MNT
done
_scratch_unmount