svn commit: r354364 - head/stand/libsa/zfs

[Toomas Soome]

Author: tsoome
Date: Tue Nov  5 18:35:13 2019
New Revision: 354364
URL: https://svnweb.freebsd.org/changeset/base/354364

Log:
  loader: clean up the noise around log device
  
  We are ignoring log device but we also do want to have clean code.

Modified:
  head/stand/libsa/zfs/zfs.c
  head/stand/libsa/zfs/zfsimpl.c

Modified: head/stand/libsa/zfs/zfs.c
==============================================================================
--- head/stand/libsa/zfs/zfs.c	Tue Nov  5 18:07:30 2019	(r354363)
+++ head/stand/libsa/zfs/zfs.c	Tue Nov  5 18:35:13 2019	(r354364)
@@ -669,14 +669,6 @@ zfs_dev_open(struct open_file *f, ...)
 		spa = spa_find_by_guid(dev->pool_guid);
 	if (!spa)
 		return (ENXIO);
-#if 0
-	/* Apparently too many are using slog with boot pool. */
-	if (spa->spa_with_log) {
-		printf("Reading pool %s is not supported due to log device.\n",
-		    spa->spa_name);
-		return (ENXIO);
-	}
-#endif
 	mount = malloc(sizeof(*mount));
 	if (mount == NULL)
 		rv = ENOMEM;

Modified: head/stand/libsa/zfs/zfsimpl.c
==============================================================================
--- head/stand/libsa/zfs/zfsimpl.c	Tue Nov  5 18:07:30 2019	(r354363)
+++ head/stand/libsa/zfs/zfsimpl.c	Tue Nov  5 18:35:13 2019	(r354364)
@@ -1774,12 +1774,6 @@ vdev_probe(vdev_phys_read_t *_read, void *read_priv, s
 		return (EIO);
 	}
 
-	if (nvlist_find(nvlist, ZPOOL_CONFIG_IS_LOG, DATA_TYPE_UINT64,
-	    NULL, &val) == 0 && val != 0) {
-		free(nvlist);
-		return (EIO);
-	}
-
 	/*
 	 * Create the pool if this is the first time we've seen it.
 	 */
@@ -1854,9 +1848,6 @@ vdev_probe(vdev_phys_read_t *_read, void *read_priv, s
 		return (EIO);
 	}
 
-	/*
-	 * We do not support reading pools with log device.
-	 */
 	if (vdev->v_islog)
 		spa->spa_with_log = vdev->v_islog;