svn commit: r348133 - stable/11/lib/libbe

[Kyle Evans]

Author: kevans
Date: Wed May 22 23:34:41 2019
New Revision: 348133
URL: https://svnweb.freebsd.org/changeset/base/348133

Log:
  MFC r347640: libbe(3): Descend into children of datasets w/ mountpoint=none
  
  These datasets will generally be canmount=noauto,mountpoint=none (e.g.
  zroot/var) but have children that may need to be mounted. Instead of
  skipping that segment for no good reason, descend.
  
  Approved by:	re (kib)

Modified:
  stable/11/lib/libbe/be_access.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/lib/libbe/be_access.c
==============================================================================
--- stable/11/lib/libbe/be_access.c	Wed May 22 23:30:51 2019	(r348132)
+++ stable/11/lib/libbe/be_access.c	Wed May 22 23:34:41 2019	(r348133)
@@ -99,13 +99,12 @@ be_mount_iter(zfs_handle_t *zfs_hdl, void *data)
 	if (strcmp("none", zfs_mnt) == 0) {
 		/*
 		 * mountpoint=none; we'll mount it at info->mountpoint assuming
-		 * we're at the root.  If we're not at the root... that's less
-		 * than stellar and not entirely sure what to do with that.
-		 * For now, we won't treat it as an error condition -- we just
-		 * won't mount it, and we'll continue on.
+		 * 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)
-			return (0);
+			goto skipmount;
 
 		snprintf(tmp, BE_MAXPATHLEN, "%s", info->mountpoint);
 	} else {
@@ -136,6 +135,7 @@ be_mount_iter(zfs_handle_t *zfs_hdl, void *data)
 	if (!info->deepmount)
 		return (0);
 
+skipmount:
 	++info->depth;
 	err = zfs_iter_filesystems(zfs_hdl, be_mount_iter, info);
 	--info->depth;