Stop using ../zfs/libzfs.h but instead use libzfs.h.

While ../zfs/libzfs.h mostly works, there are a few situations where it does not. Eliminate the problem by using plain libzfs.h, like we do for ufs support. This fixes the weird cases, and is easier to understand. It also follows the general style convetion of avoiding ../ in #includes.
nhuff · Jul 8, 2018 · 007b82d · 007b82d
1 parent b8902de
commit 007b82d
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 9 deletions.
diff --git a/stand/common/zfs_cmd.c b/stand/common/zfs_cmd.c
@@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$");
 #include "bootstrap.h"
 
 #ifdef LOADER_ZFS_SUPPORT
-#include "../zfs/libzfs.h"
+#include "libzfs.h"
 #endif
 
 COMMAND_SET(lszfs, "lszfs", "list child datasets of a zfs dataset",

diff --git a/stand/i386/libi386/Makefile b/stand/i386/libi386/Makefile
@@ -14,6 +14,7 @@ SRCS=	biosacpi.c bioscd.c biosdisk.c biosmem.c biospnp.c \
 	smbios.c time.c vidconsole.c amd64_tramp.S spinconsole.c
 .PATH:	${ZFSSRC}
 SRCS+=  devicename_stubs.c
+CFLAGS+= -I${ZFSSRC}
 
 BOOT_COMCONSOLE_PORT?= 0x3f8
 CFLAGS+=	-DCOMPORT=${BOOT_COMCONSOLE_PORT}

diff --git a/stand/i386/libi386/devicename.c b/stand/i386/libi386/devicename.c
@@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$");
 #include "bootstrap.h"
 #include "disk.h"
 #include "libi386.h"
-#include "../zfs/libzfs.h"
+#include "libzfs.h"
 
 static int	i386_parsedev(struct i386_devdesc **dev, const char *devspec, const char **path);
 

diff --git a/stand/i386/loader/conf.c b/stand/i386/loader/conf.c
@@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$");
 #include <bootstrap.h>
 #include "libi386/libi386.h"
 #if defined(LOADER_ZFS_SUPPORT)
-#include "../zfs/libzfs.h"
+#include "libzfs.h"
 #endif
 
 /*

diff --git a/stand/i386/loader/main.c b/stand/i386/loader/main.c
@@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$");
 #include "btxv86.h"
 
 #ifdef LOADER_ZFS_SUPPORT
-#include "../zfs/libzfs.h"
+#include "libzfs.h"
 #endif
 
 CTASSERT(sizeof(struct bootargs) == BOOTARGS_SIZE);

diff --git a/stand/ofw/libofw/Makefile b/stand/ofw/libofw/Makefile
@@ -9,6 +9,7 @@ SRCS=	devicename.c ofw_console.c ofw_copy.c ofw_disk.c \
 	ofw_time.c openfirm.c
 .PATH:	${ZFSSRC}
 SRCS+=  devicename_stubs.c
+CFLAGS+=	-I${ZFSSRC}
 
 # Pick up the bootstrap header for some interface items
 CFLAGS+=	-I${LDRSRC}

diff --git a/stand/ofw/libofw/devicename.c b/stand/ofw/libofw/devicename.c
@@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$");
 
 #include "bootstrap.h"
 #include "libofw.h"
-#include "../zfs/libzfs.h"
+#include "libzfs.h"
 
 static int ofw_parsedev(struct ofw_devdesc **, const char *, const char **);
 

diff --git a/stand/sparc64/loader/main.c b/stand/sparc64/loader/main.c
@@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/types.h>
 #ifdef LOADER_ZFS_SUPPORT
 #include <sys/vtoc.h>
-#include "../zfs/libzfs.h"
+#include "libzfs.h"
 #endif
 
 #include <vm/vm.h>

diff --git a/stand/userboot/userboot/conf.c b/stand/userboot/userboot/conf.c
@@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$");
 #include "libuserboot.h"
 
 #if defined(USERBOOT_ZFS_SUPPORT)
-#include "../zfs/libzfs.h"
+#include "libzfs.h"
 #endif
 
 /*

diff --git a/stand/userboot/userboot/devicename.c b/stand/userboot/userboot/devicename.c
@@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$");
 #include "libuserboot.h"
 
 #if defined(USERBOOT_ZFS_SUPPORT)
-#include "../zfs/libzfs.h"
+#include "libzfs.h"
 #endif
 
 static int	userboot_parsedev(struct disk_devdesc **dev, const char *devspec, const char **path);

diff --git a/stand/userboot/userboot/main.c b/stand/userboot/userboot/main.c
@@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$");
 #include "libuserboot.h"
 
 #if defined(USERBOOT_ZFS_SUPPORT)
-#include "../zfs/libzfs.h"
+#include "libzfs.h"
 
 static void userboot_zfs_probe(void);
 static int userboot_zfs_found;