Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk

cmd/zdump/Makefile.am

@@ -1,7 +1,14 @@
 include $(top_srcdir)/config/Rules.am
 
 DEFAULT_INCLUDES += \
-	-I${top_srcdir}/lib/libspl/include
+	-I${top_srcdir}/lib/libspl/include \
+	-I${top_srcdir}/lib/libzpool/include \
+	-I${top_srcdir}/lib/libnvpair/include \
+	-I${top_srcdir}/lib/libzfs/include \
+	-I${top_srcdir}/module/zfs/include \
+	-I${top_srcdir}/module/zcommon/include \
+	-I${top_srcdir}/module/nvpair/include \
+	-I${top_srcdir}/module/avl/include
 
 sbin_PROGRAMS = zdump
 
@@ -9,4 +16,11 @@ zdump_SOURCES = \
 	${top_srcdir}/cmd/zdump/zdump.c
 
 zdump_LDADD = \
-	$(top_builddir)/lib/libspl/libspl.la
+	$(top_builddir)/lib/libspl/libspl.la \
+	$(top_builddir)/lib/libavl/libavl.la \
+	$(top_builddir)/lib/libnvpair/libnvpair.la \
+	$(top_builddir)/lib/libuutil/libuutil.la \
+	$(top_builddir)/lib/libzpool/libzpool.la \
+	$(top_builddir)/lib/libzfs/libzfs.la
+
+zdb_LDFLAGS = -pthread -lm -lz -lrt

lib/libzpool/Makefile.am

@@ -60,6 +60,7 @@ libzpool_la_SOURCES = \
 	${top_srcdir}/module/zfs/zfs_fm.c \
 	${top_srcdir}/module/zfs/zfs_byteswap.c \
 	${top_srcdir}/module/zfs/zfs_fuid.c \
+	${top_srcdir}/module/zfs/zfs_znode.c \
 	${top_srcdir}/module/zfs/zio.c \
 	${top_srcdir}/module/zfs/zio_checksum.c \
 	${top_srcdir}/module/zfs/fletcher.c \

module/zfs/Makefile.in

@@ -62,6 +62,7 @@ ${MODULE}-objs += spa_boot.o	# Bootable root partitions
 ${MODULE}-objs += zfs_fm.o	# Post reports of FMA consumption support
 ${MODULE}-objs += zfs_byteswap.c # XXX: ?
 ${MODULE}-objs += zfs_fuid.c	# XXX: ?
+${MODULE}-objs += zfs_znode.c	# XXX: ?
 
 # ZIO (ZFS I/O Pipeline)
 ${MODULE}-objs += zio.o		# Interfaces zio core