d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libbe(3): restructure be_mount, skip canmount check for BE dataset

Browse Source 
Further cleanup after r349380; loader and kernel will both ignore canmount
on the root dataset as well, so we should not be so strict about it when
mounting it. be_mount is restructured to make it more clear that depth==0 is
special, and to not try fetching these properties that we won't care about.

MFC after:	3 days
This commit is contained in:
kevans 2019-06-25 18:47:40 +00:00
parent b3d93aa847
commit 5e80329f9c
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lib/libbe/be_access.c
View File

@ -89,25 +89,31 @@ be_mount_iter(zfs_handle_t *zfs_hdl, void *data)
return (0);
}
if (zfs_prop_get_int(zfs_hdl, ZFS_PROP_CANMOUNT) == ZFS_CANMOUNT_OFF)
return (0);
if (zfs_prop_get(zfs_hdl, ZFS_PROP_MOUNTPOINT, zfs_mnt, BE_MAXPATHLEN,
NULL, NULL, 0, 1))
return (1);
if (strcmp("none", zfs_mnt) == 0 || info->depth == 0) {
/*
* mountpoint=none; we'll mount it at info->mountpoint assuming
* we're at the root. If we're not at the root, we're likely
* at some intermediate dataset (e.g. zroot/var) that will have
* children that may need to be mounted.
*/
if (info->depth > 0)
goto skipmount;
/*
* canmount and mountpoint are both ignored for the BE dataset, because
* the rest of the system (kernel and loader) will effectively do the
* same.
*/
if (info->depth == 0) {
snprintf(tmp, BE_MAXPATHLEN, "%s", info->mountpoint);
} else {
if (zfs_prop_get_int(zfs_hdl, ZFS_PROP_CANMOUNT) ==
ZFS_CANMOUNT_OFF)
return (0);
if (zfs_prop_get(zfs_hdl, ZFS_PROP_MOUNTPOINT, zfs_mnt,
BE_MAXPATHLEN, NULL, NULL, 0, 1))
return (1);
/*
* We've encountered mountpoint=none at some intermediate
* dataset (e.g. zroot/var) that will have children that may
* need to be mounted. Skip mounting it, but iterate through
* the children.
*/
if (strcmp("none", zfs_mnt) == 0)
goto skipmount;
mountpoint = be_mountpoint_augmented(info->lbh, zfs_mnt);
snprintf(tmp, BE_MAXPATHLEN, "%s%s", info->mountpoint,
mountpoint);