Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch

configure.ac

@@ -113,7 +113,6 @@ AC_CONFIG_FILES([ Makefile
                   lib/libzcommon/Makefile
                   lib/libzpool/Makefile
                   lib/libzfs/Makefile
-                  lib/libzfs/include/Makefile
                   cmd/Makefile
                   cmd/zdb/Makefile
                   cmd/zdump/Makefile

lib/libnvpair/Makefile.am

@@ -1,13 +1,14 @@
 include $(top_srcdir)/config/Rules.am
 
 DEFAULT_INCLUDES  = -I${moddir}/nvpair/include \
+                    -I${libdir}/libnvpair/include \
                     -I${libdir}/libspl/include
 
 lib_LTLIBRARIES = libnvpair.la
 
-libnvpair_la_SOURCES = ${moddir}/nvpair/nvpair.c \
+libnvpair_la_SOURCES = libnvpair.c \
-                       ${libdir}/libnvpair/libnvpair.c \
+                       nvpair_alloc_system.c \
-                       ${libdir}/libnvpair/nvpair_alloc_system.c \
+                       include/libnvpair.h
+                       ${moddir}/nvpair/nvpair.c \
                        ${moddir}/nvpair/include/sys/nvpair.h \
-                       ${moddir}/nvpair/include/sys/nvpair_impl.h
+                       ${moddir}/nvpair/include/sys/nvpair_impl.h \
-                       ${libdir}/libnvpair/include/libnvpair.h

lib/libuutil/Makefile.am

@@ -0,0 +1,19 @@
+include $(top_srcdir)/config/Rules.am
+
+DEFAULT_INCLUDES  = -I${libdir}/libuutil/include \
+                    -I${libdir}/libspl/include
+
+lib_LTLIBRARIES = libuutil.la
+
+libuutil_la_SOURCES = uu_alloc.c \
+                      uu_avl.c \
+                      uu_dprintf.c \
+                      uu_ident.c \
+                      uu_list.c \
+                      uu_misc.c \
+                      uu_open.c \
+                      uu_pname.c \
+                      uu_strtoint.c \
+                      include/libuutil.h \
+                      include/libuutil_common.h \
+                      include/libuutil_impl.h

lib/libzcommon/Makefile.am

@@ -0,0 +1,20 @@
+include $(top_srcdir)/config/Rules.am
+
+DEFAULT_INCLUDES  = -I${moddir}/zcommon/include \
+                    -I${libdir}/libspl/include
+
+lib_LTLIBRARIES = libzcommon.la
+
+libzfs_la_SOURCES = ${moddir}/zcommon/zfs_comutil.c \
+                    ${moddir}/zcommon/zfs_deleg.c \
+                    ${moddir}/zcommon/zfs_namecheck.c \
+                    ${moddir}/zcommon/zfs_prop.c \
+                    ${moddir}/zcommon/zpool_prop.c \
+                    ${moddir}/zcommon/zprop_common.c \
+                    ${moddir}/zcommon/include/sys/fm/fs/zfs.h \
+                    ${moddir}/zcommon/include/sys/fs \
+                    ${moddir}/zcommon/include/sys/fs/zfs.h \
+                    ${moddir}/zcommon/include/zfs_comutil.h \
+                    ${moddir}/zcommon/include/zfs_deleg.h \
+                    ${moddir}/zcommon/include/zfs_namecheck.h \
+                    ${moddir}/zcommon/include/zfs_prop.h \

lib/libzfs/Makefile.am

@@ -0,0 +1,19 @@
+include $(top_srcdir)/config/Rules.am
+
+DEFAULT_INCLUDES  = -I${libdir}/libzfs/include \
+                    -I${libdir}/libspl/include
+
+lib_LTLIBRARIES = libzfs.la
+
+libzfs_la_SOURCES = libzfs_changelist.c \
+                    libzfs_config.c \
+                    libzfs_dataset.c \
+                    libzfs_graph.c \
+                    libzfs_import.c \
+                    libzfs_mount.c \
+                    libzfs_pool.c \
+                    libzfs_sendrecv.c \
+                    libzfs_status.c \
+                    libzfs_util.c \
+                    include/libzfs.h \
+                    include/libzfs_impl.h

module/Makefile.in

@@ -0,0 +1,13 @@
+subdir-m = avl nvpair zcommon zfs
+
+# Make the exported SPL symbols available to these modules.
+# Unfortunately there is not a cleaner way to do this, modpost
+# does not contain an option to search additional symbol files.
+all:
+	cp @splsymvers@ .
+	$(MAKE) -C @LINUX@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ modules
+
+install uninstall clean distclean maintainer-clean distdir:
+	$(MAKE) -C @LINUX@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ $@
+
+check:

zfs/Makefile.in

@@ -1,16 +0,0 @@
-subdir-m += lib
-subdir-m += zcmd
-
-all:
-# Make the exported SPL symbols available to this module.  There
-# is probably a better way to do this, but this will have to do
-# for now...  an option to modpost perhaps.
-	cp @splsymvers@ .
-
-# Kick off the kernel build system
-	$(MAKE) -C @LINUX@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ modules
-
-install uninstall clean distclean maintainer-clean distdir:
-	$(MAKE) -C @LINUX@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ $@
-
-check:

zfs/lib/libspl/include/Makefile.in

@@ -1 +0,0 @@
-subdir-m += sys

zfs/lib/libspl/include/sys/Makefile.in

@@ -1 +0,0 @@
-DISTFILES  = list.h list_impl.h vmem.h

zfs/lib/libuutil/Makefile.in

@@ -1,34 +0,0 @@
-subdir-m += include
-DISTFILES = Makefile.in *.c
-
-LIBRARY := libuutil
-
-# Compile as shared library.  There's an extra useless host program
-# here called 'zu' because it was the easiest way I could convince
-# the kernel build system to construct a user space shared library.
-
-HOSTCFLAGS += @HOSTCFLAGS@
-HOSTCFLAGS += -I@LIBDIR@/libspl/include
-HOSTCFLAGS += -I@LIBDIR@/libavl/include
-HOSTCFLAGS += -I@LIBDIR@/libuutil/include
-HOSTCFLAGS += -DNATIVE_BUILD
-
-HOSTLDFLAGS += -pthread
-HOSTLDFLAGS += -lrt
-HOSTLDFLAGS += -lspl -L@LIBDIR@/libspl
-HOSTLDFLAGS += -lavl -L@LIBDIR@/libavl
-
-hostprogs-y := zu
-always := $(hostprogs-y)
-
-zu-objs := zu.o ${LIBRARY}.so
-
-${LIBRARY}-objs += uu_alloc.o
-${LIBRARY}-objs += uu_avl.o
-${LIBRARY}-objs += uu_dprintf.o
-${LIBRARY}-objs += uu_ident.o
-${LIBRARY}-objs += uu_list.o
-${LIBRARY}-objs += uu_misc.o
-${LIBRARY}-objs += uu_open.o
-${LIBRARY}-objs += uu_pname.o
-${LIBRARY}-objs += uu_strtoint.o

zfs/lib/libuutil/include/Makefile.in

@@ -1 +0,0 @@
-DISTFILES = libuutil.h libuutil_common.h libuutil_impl.h

zfs/lib/libzfs/Makefile.in

@@ -1,44 +0,0 @@
-subdir-m += include
-DISTFILES  = libzfs_changelist.c libzfs_config.c libzfs_dataset.c
-DISTFILES += libzfs_graph.c libzfs_import.c libzfs_mount.c libzfs_pool.c
-DISTFILES += libzfs_sendrecv.c libzfs_status.c libzfs_util.c
-
-LIBRARY := libzfs
-
-# Compile as shared library.  There's an extra useless host program
-# here called 'zu' because it was the easiest way I could convince
-# the kernel build system to construct a user space shared library.
-
-HOSTCFLAGS += @HOSTCFLAGS@
-HOSTCFLAGS += -I@LIBDIR@/libzfs/include
-HOSTCFLAGS += -I@LIBDIR@/libspl/include
-HOSTCFLAGS += -I@LIBDIR@/libumem/include
-HOSTCFLAGS += -I@LIBDIR@/libuutil/include
-HOSTCFLAGS += -I@LIBDIR@/libnvpair/include
-HOSTCFLAGS += -I@LIBDIR@/libavl/include
-HOSTCFLAGS += -I@LIBDIR@/libzcommon/include
-HOSTCFLAGS += -I@LIBDIR@/libdmu-ctl/include
-HOSTCFLAGS += -I@LIBDIR@/libzpool	# For existing fletcher.c hack
-
-HOSTLDFLAGS += -ldl -lm
-HOSTLDFLAGS += -lavl -L@LIBDIR@/libavl
-HOSTLDFLAGS += -lnvpair -L@LIBDIR@/libnvpair
-HOSTLDFLAGS += -lspl -L@LIBDIR@/libspl
-HOSTLDFLAGS += -luutil -L@LIBDIR@/libuutil
-HOSTLDFLAGS += -lzcommon -L@LIBDIR@/libzcommon
-
-hostprogs-y := zu
-always := $(hostprogs-y)
-
-zu-objs := zu.o ${LIBRARY}.so
-
-${LIBRARY}-objs += libzfs_dataset.o	# Interface for manipulating datasets
-${LIBRARY}-objs += libzfs_pool.o	# Interface for manipulating pools
-${LIBRARY}-objs += libzfs_changelist.o	# Support for property changes
-${LIBRARY}-objs += libzfs_config.o	# Interface for manipulating configuration
-${LIBRARY}-objs += libzfs_graph.o	# Support for dependent list for datasets
-${LIBRARY}-objs += libzfs_import.o	# Discover and import pools
-${LIBRARY}-objs += libzfs_mount.o	# Mount, unmount, and share datasets
-${LIBRARY}-objs += libzfs_status.o	# Status
-${LIBRARY}-objs += libzfs_util.o	# Misc support
-${LIBRARY}-objs += libzfs_sendrecv.o

zfs/lib/libzfs/include/Makefile.in

@@ -1 +0,0 @@
-DISTFILES = libzfs.h libzfs_impl.h

zfs/zcmd/Makefile.in

@@ -1,7 +0,0 @@
-subdir-m += zfs
-subdir-m += zpool
-#subdir-m += zdb
-#subdir-m += ztest
-#subdir-m += zdump
-#subdir-m += zinject
-subdir-m += zpios

zfs/zcmd/zdb/Makefile.in

@@ -1,28 +0,0 @@
-DISTFILES = Makefile.in zdb.c zdb_il.c
-
-CMD := zdb
-
-HOSTCFLAGS += @HOSTCFLAGS@
-HOSTCFLAGS += -I@CMDDIR@/zdb/
-HOSTCFLAGS += -I@LIBDIR@/libspl/include
-HOSTCFLAGS += -I@LIBDIR@/libavl/include
-HOSTCFLAGS += -I@LIBDIR@/libnvpair/include
-HOSTCFLAGS += -I@LIBDIR@/libuutil/include
-HOSTCFLAGS += -I@LIBDIR@/libzcommon/include
-HOSTCFLAGS += -I@LIBDIR@/libzfs/include
-
-HOSTLDFLAGS += -lavl -L@LIBDIR@/libavl
-HOSTLDFLAGS += -lnvpair -L@LIBDIR@/libnvpair
-HOSTLDFLAGS += -luutil -L@LIBDIR@/libuutil
-HOSTLDFLAGS += -lspl -L@LIBDIR@/libspl
-HOSTLDFLAGS += -lzcommon -L@LIBDIR@/libzcommon
-HOSTLDFLAGS += -lzfs -L@LIBDIR@/libzfs
-
-# Additional shared library paths for executing binaries in-tree
-export LD_RUN_PATH = @LIBDIR@/libavl:@LIBDIR@/libnvpair:@LIBDIR@/libuutil:@LIBDIR@/libspl:@LIBDIR@/libzcommon:@LIBDIR@/libzfs
-
-hostprogs-y := ${CMD}
-always := $(hostprogs-y)
-
-${CMD}-objs += zdb_il.o
-${CMD}-objs += zdb.o		# Core command

zfs/zcmd/zdump/Makefile.in

@@ -1,27 +0,0 @@
-DISTFILES = Makefile.in zdump.c
-
-CMD := zdump
-
-HOSTCFLAGS += @HOSTCFLAGS@
-HOSTCFLAGS += -I@CMDDIR@/zdump/
-HOSTCFLAGS += -I@LIBDIR@/libspl/include
-HOSTCFLAGS += -I@LIBDIR@/libavl/include
-HOSTCFLAGS += -I@LIBDIR@/libnvpair/include
-HOSTCFLAGS += -I@LIBDIR@/libuutil/include
-HOSTCFLAGS += -I@LIBDIR@/libzcommon/include
-HOSTCFLAGS += -I@LIBDIR@/libzfs/include
-
-HOSTLDFLAGS += -lavl -L@LIBDIR@/libavl
-HOSTLDFLAGS += -lnvpair -L@LIBDIR@/libnvpair
-HOSTLDFLAGS += -luutil -L@LIBDIR@/libuutil
-HOSTLDFLAGS += -lspl -L@LIBDIR@/libspl
-HOSTLDFLAGS += -lzcommon -L@LIBDIR@/libzcommon
-HOSTLDFLAGS += -lzfs -L@LIBDIR@/libzfs
-
-# Additional shared library paths for executing binaries in-tree
-export LD_RUN_PATH = @LIBDIR@/libavl:@LIBDIR@/libnvpair:@LIBDIR@/libuutil:@LIBDIR@/libspl:@LIBDIR@/libzcommon:@LIBDIR@/libzfs
-
-hostprogs-y := ${CMD}
-always := $(hostprogs-y)
-
-${CMD}-objs += zdump.o		# Arg processing

zfs/zcmd/zfs/Makefile.in

@@ -1,28 +0,0 @@
-DISTFILES = Makefile.in zfs_iter.c zfs_main.c zfs_util.h zfs_iter.h
-
-CMD := zfs
-
-HOSTCFLAGS += @HOSTCFLAGS@
-HOSTCFLAGS += -I@CMDDIR@/zpool/
-HOSTCFLAGS += -I@LIBDIR@/libspl/include
-HOSTCFLAGS += -I@LIBDIR@/libavl/include
-HOSTCFLAGS += -I@LIBDIR@/libnvpair/include
-HOSTCFLAGS += -I@LIBDIR@/libuutil/include
-HOSTCFLAGS += -I@LIBDIR@/libzcommon/include
-HOSTCFLAGS += -I@LIBDIR@/libzfs/include
-
-HOSTLDFLAGS += -lavl -L@LIBDIR@/libavl
-HOSTLDFLAGS += -lnvpair -L@LIBDIR@/libnvpair
-HOSTLDFLAGS += -luutil -L@LIBDIR@/libuutil
-HOSTLDFLAGS += -lspl -L@LIBDIR@/libspl
-HOSTLDFLAGS += -lzcommon -L@LIBDIR@/libzcommon
-HOSTLDFLAGS += -lzfs -L@LIBDIR@/libzfs
-
-# Additional shared library paths for executing binaries in-tree
-export LD_RUN_PATH = @LIBDIR@/libavl:@LIBDIR@/libnvpair:@LIBDIR@/libuutil:@LIBDIR@/libspl:@LIBDIR@/libzcommon:@LIBDIR@/libzfs
-
-hostprogs-y := ${CMD}
-always := $(hostprogs-y)
-
-${CMD}-objs += zfs_main.o	# Arg processing
-${CMD}-objs += zfs_iter.o	# Iterator support

zfs/zcmd/zinject/Makefile.in

@@ -1,28 +0,0 @@
-DISTFILES = Makefile.in translate.c zinject.c zinject.h
-
-CMD := zinject
-
-HOSTCFLAGS += @HOSTCFLAGS@
-HOSTCFLAGS += -I@CMDDIR@/zinject/
-HOSTCFLAGS += -I@LIBDIR@/libspl/include
-HOSTCFLAGS += -I@LIBDIR@/libavl/include
-HOSTCFLAGS += -I@LIBDIR@/libnvpair/include
-HOSTCFLAGS += -I@LIBDIR@/libuutil/include
-HOSTCFLAGS += -I@LIBDIR@/libzcommon/include
-HOSTCFLAGS += -I@LIBDIR@/libzfs/include
-
-HOSTLDFLAGS += -lavl -L@LIBDIR@/libavl
-HOSTLDFLAGS += -lnvpair -L@LIBDIR@/libnvpair
-HOSTLDFLAGS += -luutil -L@LIBDIR@/libuutil
-HOSTLDFLAGS += -lspl -L@LIBDIR@/libspl
-HOSTLDFLAGS += -lzcommon -L@LIBDIR@/libzcommon
-HOSTLDFLAGS += -lzfs -L@LIBDIR@/libzfs
-
-# Additional shared library paths for executing binaries in-tree
-export LD_RUN_PATH = @LIBDIR@/libavl:@LIBDIR@/libnvpair:@LIBDIR@/libuutil:@LIBDIR@/libspl:@LIBDIR@/libzcommon:@LIBDIR@/libzfs
-
-hostprogs-y := ${CMD}
-always := $(hostprogs-y)
-
-${CMD}-objs += translate.o	# Translation support
-${CMD}-objs += zinject.o	# Core command

zfs/zcmd/zpool/Makefile.in

@@ -1,30 +0,0 @@
-DISTFILES = Makefile.in zpool_main.c zpool_iter.c zpool_util.c zpool_vdev.c zpool_util.h
-
-CMD := zpool
-
-HOSTCFLAGS += @HOSTCFLAGS@
-HOSTCFLAGS += -I@CMDDIR@/zpool/
-HOSTCFLAGS += -I@LIBDIR@/libspl/include
-HOSTCFLAGS += -I@LIBDIR@/libavl/include
-HOSTCFLAGS += -I@LIBDIR@/libnvpair/include
-HOSTCFLAGS += -I@LIBDIR@/libuutil/include
-HOSTCFLAGS += -I@LIBDIR@/libzcommon/include
-HOSTCFLAGS += -I@LIBDIR@/libzfs/include
-
-HOSTLDFLAGS += -lavl -L@LIBDIR@/libavl
-HOSTLDFLAGS += -lnvpair -L@LIBDIR@/libnvpair
-HOSTLDFLAGS += -luutil -L@LIBDIR@/libuutil
-HOSTLDFLAGS += -lspl -L@LIBDIR@/libspl
-HOSTLDFLAGS += -lzcommon -L@LIBDIR@/libzcommon
-HOSTLDFLAGS += -lzfs -L@LIBDIR@/libzfs
-
-# Additional shared library paths for executing binaries in-tree
-export LD_RUN_PATH = @LIBDIR@/libavl:@LIBDIR@/libnvpair:@LIBDIR@/libuutil:@LIBDIR@/libspl:@LIBDIR@/libzcommon:@LIBDIR@/libzfs
-
-hostprogs-y := ${CMD}
-always := $(hostprogs-y)
-
-${CMD}-objs += zpool_main.o	# Arg processing
-${CMD}-objs += zpool_iter.o	# Iterator support
-${CMD}-objs += zpool_util.o	# Misc support
-${CMD}-objs += zpool_vdev.o	# Converts vdevs to nvlists for libzfs

zfs/zcmd/ztest/Makefile.in

@@ -1,28 +0,0 @@
-DISTFILES = Makefile.in ztest.c
-
-CMD := ztest
-
-HOSTCFLAGS += @HOSTCFLAGS@
-HOSTCFLAGS += -I@CMDDIR@/ztest/
-HOSTCFLAGS += -I@LIBDIR@/libspl/include
-HOSTCFLAGS += -I@LIBDIR@/libavl/include
-HOSTCFLAGS += -I@LIBDIR@/libnvpair/include
-HOSTCFLAGS += -I@LIBDIR@/libuutil/include
-HOSTCFLAGS += -I@LIBDIR@/libzcommon/include
-HOSTCFLAGS += -I@LIBDIR@/libzfs/include
-
-HOSTLDFLAGS += -lavl -L@LIBDIR@/libavl
-HOSTLDFLAGS += -lnvpair -L@LIBDIR@/libnvpair
-HOSTLDFLAGS += -luutil -L@LIBDIR@/libuutil
-HOSTLDFLAGS += -lspl -L@LIBDIR@/libspl
-HOSTLDFLAGS += -lzcommon -L@LIBDIR@/libzcommon
-HOSTLDFLAGS += -lzfs -L@LIBDIR@/libzfs
-
-# Additional shared library paths for executing binaries in-tree
-export LD_RUN_PATH = @LIBDIR@/libavl:@LIBDIR@/libnvpair:@LIBDIR@/libuutil:@LIBDIR@/libspl:@LIBDIR@/libzcommon:@LIBDIR@/libzfs
-
-hostprogs-y := ${CMD}
-always := $(hostprogs-y)
-
-${CMD}-objs += ztest.o	# Core command
-