FreeBSD: Fix zfsd auto online

The path passed may in fact be a guid, so we want to use the fullpath we looked up from the pool config instead. But, this causes tests to fail on Linux so we only do it for FreeBSD. Signed-off-by: Ryan Moeller <[email protected]>
anodos325 · Feb 25, 2022 · 31158fd · 31158fd
1 parent 676ac05
commit 31158fd
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/lib/libzfs/libzfs_pool.c b/lib/libzfs/libzfs_pool.c
@@ -3072,11 +3072,15 @@ zpool_vdev_online(zpool_handle_t *zhp, const char *path, int flags,
 		}
 
 		if (wholedisk) {
+#ifdef __FreeBSD__
+			const char *fullpath = pathname;
+#else
 			const char *fullpath = path;
+#endif
 			char buf[MAXPATHLEN];
 
-			if (path[0] != '/') {
-				error = zfs_resolve_shortname(path, buf,
+			if (fullpath[0] != '/') {
+				error = zfs_resolve_shortname(fullpath, buf,
 				    sizeof (buf));
 				if (error != 0)
 					return (zfs_error(hdl, EZFS_NODEVICE,