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

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
+1 -2
View File
@@ -110,8 +110,7 @@ mount_dirs()
_overlay_mount_dirs $SCRATCH_MNT $upper2 $work2 overlay2 $mnt2 \
-o "index=on,nfs_export=on,redirect_dir=on" 2>/dev/null ||
_notrun "cannot mount nested overlay with nfs_export=on option"
_fs_options overlay2 | grep -q "nfs_export=on" || \
_notrun "cannot enable nfs_export feature on nested overlay"
_check_overlay_feature nfs_export overlay2 $mnt2
}
# Unmount the nested overlay mount and check underlying overlay layers