c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-25 02:49:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

ZTS: Fix verify_fs_mount in delegate_common.kshlib

Browse Source 
verify_fs_mount expects the dataset to remain unmounted after
updating the mountpoint property in delegate_common.kshlib.

This commit updates verify_fs_mount and uses nomount parameter
for zfs set to update the mountpoint property without mounting
the dataset.

This fixes the zfs_allow_010_pos test case, which was failing on
FreeBSD after the behavior update in setting the mountpoint
property.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Signed-off-by: Umer Saleem <usaleem@ixsystems.com>
Closes #15376
This commit is contained in:
Umer Saleem 2023-10-10 05:24:24 +05:00 committed by Brian Behlendorf
parent 8d47d2d579
commit 9fa06c5574
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/zfs-tests/tests/functional/delegate/delegate_common.kshlib
View File

@ -861,7 +861,7 @@ function verify_fs_mount
fi fi
if ! ismounted $fs ; then if ! ismounted $fs ; then
log_must zfs set mountpoint=$newmntpt $fs log_must zfs set -u mountpoint=$newmntpt $fs
log_must rm -rf $newmntpt log_must rm -rf $newmntpt
log_must mkdir $newmntpt log_must mkdir $newmntpt
@ -878,7 +878,7 @@ function verify_fs_mount
fi fi
log_must zfs umount $fs log_must zfs umount $fs
log_must rm -rf $newmntpt log_must rm -rf $newmntpt
log_must zfs set mountpoint=$mntpt $fs log_must zfs set -u mountpoint=$mntpt $fs
fi fi
return 0 return 0