D39408.id119839.diff
No OneTemporary
Actions

Size

951 B

Referenced Files

None

Subscribers

None

D39408.id119839.diff
View Options

	diff --git a/stand/libsa/zfs/zfs.c b/stand/libsa/zfs/zfs.c
	--- a/stand/libsa/zfs/zfs.c
	+++ b/stand/libsa/zfs/zfs.c
	@@ -373,6 +373,19 @@
	}
	}

	+static spa_t *
	+spa_find_by_dev(struct zfs_devdesc *dev)
	+{
	+
	+ if (dev->dd.d_dev->dv_type != DEVT_ZFS)
	+ return (NULL);
	+
	+ if (dev->pool_guid == 0)
	+ return (STAILQ_FIRST(&zfs_pools));
	+
	+ return (spa_find_by_guid(dev->pool_guid));
	+}
	+
	/*
	* if path is NULL, create mount structure, but do not add it to list.
	*/
	diff --git a/stand/libsa/zfs/zfsimpl.c b/stand/libsa/zfs/zfsimpl.c
	--- a/stand/libsa/zfs/zfsimpl.c
	+++ b/stand/libsa/zfs/zfsimpl.c
	@@ -1367,19 +1367,6 @@
	return (NULL);
	}

	-static spa_t *
	-spa_find_by_dev(struct zfs_devdesc *dev)
	-{
	-
	- if (dev->dd.d_dev->dv_type != DEVT_ZFS)
	- return (NULL);
	-
	- if (dev->pool_guid == 0)
	- return (STAILQ_FIRST(&zfs_pools));
	-
	- return (spa_find_by_guid(dev->pool_guid));
	-}
	-
	static spa_t *
	spa_create(uint64_t guid, const char *name)
	{