Merge commit 'refs/top-bases/top' into top

2009-10-23 12:35:42 -07:00 · 2009-10-23 12:35:42 -07:00 · d4842bbc1c
parent 5125a4fc74 f11e5e26e2
commit d4842bbc1c
27 changed files with 68 additions and 30 deletions
--- a/Makefile.in
+++ b/Makefile.in
@ -181,6 +181,7 @@ SPL_VERSION = @SPL_VERSION@
 STRIP = @STRIP@
 TARGET_ASM_DIR = @TARGET_ASM_DIR@
 TOPDIR = @TOPDIR@
+USERDEBUG = @USERDEBUG@
 VERSION = @VERSION@
 ZFS_CONFIG = @ZFS_CONFIG@
 ZFS_META_ALIAS = @ZFS_META_ALIAS@
--- a/cmd/Makefile.in
+++ b/cmd/Makefile.in
@ -153,6 +153,7 @@ SPL_VERSION = @SPL_VERSION@
 STRIP = @STRIP@
 TARGET_ASM_DIR = @TARGET_ASM_DIR@
 TOPDIR = @TOPDIR@
+USERDEBUG = @USERDEBUG@
 VERSION = @VERSION@
 ZFS_CONFIG = @ZFS_CONFIG@
 ZFS_META_ALIAS = @ZFS_META_ALIAS@
--- a/cmd/zdb/Makefile.in
+++ b/cmd/zdb/Makefile.in
@ -172,6 +172,7 @@ SPL_VERSION = @SPL_VERSION@
 STRIP = @STRIP@
 TARGET_ASM_DIR = @TARGET_ASM_DIR@
 TOPDIR = @TOPDIR@
+USERDEBUG = @USERDEBUG@
 VERSION = @VERSION@
 ZFS_CONFIG = @ZFS_CONFIG@
 ZFS_META_ALIAS = @ZFS_META_ALIAS@
@ -246,7 +247,7 @@ DEFAULT_INCLUDES = -I${top_srcdir} -I${top_srcdir}/lib/libspl/include \

 # Expected defines not covered by zfs_config.h or spl_config.h
 AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing -Werror \
-	-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
+	-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT $(USERDEBUG) \
 	-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
 	-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
 zdb_SOURCES = \
--- a/cmd/zfs/Makefile.in
+++ b/cmd/zfs/Makefile.in
@ -172,6 +172,7 @@ SPL_VERSION = @SPL_VERSION@
 STRIP = @STRIP@
 TARGET_ASM_DIR = @TARGET_ASM_DIR@
 TOPDIR = @TOPDIR@
+USERDEBUG = @USERDEBUG@
 VERSION = @VERSION@
 ZFS_CONFIG = @ZFS_CONFIG@
 ZFS_META_ALIAS = @ZFS_META_ALIAS@
@ -245,7 +246,7 @@ DEFAULT_INCLUDES = -I${top_srcdir} -I${top_srcdir}/lib/libspl/include \

 # Expected defines not covered by zfs_config.h or spl_config.h
 AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing -Werror \
-	-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
+	-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT $(USERDEBUG) \
 	-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
 	-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
 zfs_SOURCES = \
--- a/cmd/zinject/Makefile.in
+++ b/cmd/zinject/Makefile.in
@ -172,6 +172,7 @@ SPL_VERSION = @SPL_VERSION@
 STRIP = @STRIP@
 TARGET_ASM_DIR = @TARGET_ASM_DIR@
 TOPDIR = @TOPDIR@
+USERDEBUG = @USERDEBUG@
 VERSION = @VERSION@
 ZFS_CONFIG = @ZFS_CONFIG@
 ZFS_META_ALIAS = @ZFS_META_ALIAS@
@ -247,7 +248,7 @@ DEFAULT_INCLUDES = -I${top_srcdir} -I${top_srcdir}/lib/libspl/include \

 # Expected defines not covered by zfs_config.h or spl_config.h
 AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing -Werror \
-	-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
+	-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT $(USERDEBUG) \
 	-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
 	-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
 zinject_SOURCES = \
--- a/cmd/zpios/Makefile.in
+++ b/cmd/zpios/Makefile.in
@ -165,6 +165,7 @@ SPL_VERSION = @SPL_VERSION@
 STRIP = @STRIP@
 TARGET_ASM_DIR = @TARGET_ASM_DIR@
 TOPDIR = @TOPDIR@
+USERDEBUG = @USERDEBUG@
 VERSION = @VERSION@
 ZFS_CONFIG = @ZFS_CONFIG@
 ZFS_META_ALIAS = @ZFS_META_ALIAS@
@ -231,7 +232,7 @@ DEFAULT_INCLUDES = -I${top_srcdir} \

 # Expected defines not covered by zfs_config.h or spl_config.h
 AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing -Werror \
-	-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
+	-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT $(USERDEBUG) \
 	-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
 	-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
 zpios_SOURCES = \
--- a/cmd/zpool/Makefile.in
+++ b/cmd/zpool/Makefile.in
@ -173,6 +173,7 @@ SPL_VERSION = @SPL_VERSION@
 STRIP = @STRIP@
 TARGET_ASM_DIR = @TARGET_ASM_DIR@
 TOPDIR = @TOPDIR@
+USERDEBUG = @USERDEBUG@
 VERSION = @VERSION@
 ZFS_CONFIG = @ZFS_CONFIG@
 ZFS_META_ALIAS = @ZFS_META_ALIAS@
@ -246,7 +247,7 @@ DEFAULT_INCLUDES = -I${top_srcdir} -I${top_srcdir}/lib/libspl/include \

 # Expected defines not covered by zfs_config.h or spl_config.h
 AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing -Werror \
-	-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
+	-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT $(USERDEBUG) \
 	-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
 	-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
 zpool_SOURCES = \
--- a/cmd/ztest/Makefile.in
+++ b/cmd/ztest/Makefile.in
@ -172,6 +172,7 @@ SPL_VERSION = @SPL_VERSION@
 STRIP = @STRIP@
 TARGET_ASM_DIR = @TARGET_ASM_DIR@
 TOPDIR = @TOPDIR@
+USERDEBUG = @USERDEBUG@
 VERSION = @VERSION@
 ZFS_CONFIG = @ZFS_CONFIG@
 ZFS_META_ALIAS = @ZFS_META_ALIAS@
@ -247,7 +248,7 @@ DEFAULT_INCLUDES = -I${top_srcdir} -I${top_srcdir}/lib/libspl/include \

 # Expected defines not covered by zfs_config.h or spl_config.h
 AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing -Werror \
-	-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
+	-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT $(USERDEBUG) \
 	-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
 	-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
 ztest_SOURCES = \
--- a/config/Makefile.in
+++ b/config/Makefile.in
@ -145,6 +145,7 @@ SPL_VERSION = @SPL_VERSION@
 STRIP = @STRIP@
 TARGET_ASM_DIR = @TARGET_ASM_DIR@
 TOPDIR = @TOPDIR@
+USERDEBUG = @USERDEBUG@
 VERSION = @VERSION@
 ZFS_CONFIG = @ZFS_CONFIG@
 ZFS_META_ALIAS = @ZFS_META_ALIAS@
--- a/12
+++ b/12
@ -462,7 +462,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"

-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS ZFS_META_NAME ZFS_META_VERSION ZFS_META_RELEASE ZFS_META_ALIAS ZFS_META_DATA ZFS_META_AUTHOR ZFS_META_LT_CURRENT ZFS_META_LT_REVISION ZFS_META_LT_AGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL CCAS CCASFLAGS LICENSE TOPDIR BUILDDIR LIBDIR CMDDIR MODDIR SCRIPTDIR ZFS_CONFIG LINUX LINUX_OBJ LINUX_VERSION LINUX_SYMBOLS SPL SPL_OBJ SPL_VERSION SPL_SYMBOLS KERNELMAKE_PARAMS KERNELCPPFLAGS TARGET_ASM_DIR ZLIB LIBUUID LIBBLKID CONFIG_USER_TRUE CONFIG_USER_FALSE CONFIG_KERNEL_TRUE CONFIG_KERNEL_FALSE LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS ZFS_META_NAME ZFS_META_VERSION ZFS_META_RELEASE ZFS_META_ALIAS ZFS_META_DATA ZFS_META_AUTHOR ZFS_META_LT_CURRENT ZFS_META_LT_REVISION ZFS_META_LT_AGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL CCAS CCASFLAGS LICENSE TOPDIR BUILDDIR LIBDIR CMDDIR MODDIR SCRIPTDIR ZFS_CONFIG LINUX LINUX_OBJ LINUX_VERSION LINUX_SYMBOLS SPL SPL_OBJ SPL_VERSION SPL_SYMBOLS KERNELMAKE_PARAMS KERNELCPPFLAGS TARGET_ASM_DIR ZLIB LIBUUID LIBBLKID CONFIG_USER_TRUE CONFIG_USER_FALSE CONFIG_KERNEL_TRUE CONFIG_KERNEL_FALSE USERDEBUG LIBOBJS LTLIBOBJS'
 ac_subst_files=''

 # Initialize some variables set by options.
@ -22470,8 +22470,14 @@ fi;
 if test "$zfs_ac_debug" = yes; then
 	echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
+
+cat >>confdefs.h <<\_ACEOF
+#define DEBUG 1
+_ACEOF
+
 		KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG "
 		HOSTCFLAGS="${HOSTCFLAGS} -DDEBUG "
+		USERDEBUG="-DDEBUG"
 	else
 		echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
@ -22482,9 +22488,12 @@ _ACEOF

 		KERNELCPPFLAGS="${KERNELCPPFLAGS} -DNDEBUG "
 		HOSTCFLAGS="${HOSTCFLAGS} -DNDEBUG "
+		USERDEBUG="-DNDEBUG"
 	fi


+
+
                                                                                                                                                                                                                                                                                                                                                    ac_config_files="$ac_config_files Makefile config/Makefile doc/Makefile lib/Makefile lib/libspl/Makefile lib/libspl/asm-generic/Makefile lib/libspl/asm-i386/Makefile lib/libspl/asm-x86_64/Makefile lib/libspl/include/Makefile lib/libavl/Makefile lib/libefi/Makefile lib/libnvpair/Makefile lib/libunicode/Makefile lib/libuutil/Makefile lib/libzpool/Makefile lib/libzpool/include/Makefile lib/libzfs/Makefile cmd/Makefile cmd/zdb/Makefile cmd/zfs/Makefile cmd/zinject/Makefile cmd/zpool/Makefile cmd/ztest/Makefile cmd/zpios/Makefile module/Makefile module/avl/Makefile module/nvpair/Makefile module/unicode/Makefile module/zcommon/Makefile module/zfs/Makefile module/zpios/Makefile scripts/Makefile zfs.spec zfs-modules.spec"


@ -23296,6 +23305,7 @@ s,@CONFIG_USER_TRUE@,$CONFIG_USER_TRUE,;t t
 s,@CONFIG_USER_FALSE@,$CONFIG_USER_FALSE,;t t
 s,@CONFIG_KERNEL_TRUE@,$CONFIG_KERNEL_TRUE,;t t
 s,@CONFIG_KERNEL_FALSE@,$CONFIG_KERNEL_FALSE,;t t
+s,@USERDEBUG@,$USERDEBUG,;t t
 s,@LIBOBJS@,$LIBOBJS,;t t
 s,@LTLIBOBJS@,$LTLIBOBJS,;t t
 CEOF
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@ -144,6 +144,7 @@ SPL_VERSION = @SPL_VERSION@
 STRIP = @STRIP@
 TARGET_ASM_DIR = @TARGET_ASM_DIR@
 TOPDIR = @TOPDIR@
+USERDEBUG = @USERDEBUG@
 VERSION = @VERSION@
 ZFS_CONFIG = @ZFS_CONFIG@
 ZFS_META_ALIAS = @ZFS_META_ALIAS@
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@ -153,6 +153,7 @@ SPL_VERSION = @SPL_VERSION@
 STRIP = @STRIP@
 TARGET_ASM_DIR = @TARGET_ASM_DIR@
 TOPDIR = @TOPDIR@
+USERDEBUG = @USERDEBUG@
 VERSION = @VERSION@
 ZFS_CONFIG = @ZFS_CONFIG@
 ZFS_META_ALIAS = @ZFS_META_ALIAS@
--- a/lib/libavl/Makefile.in
+++ b/lib/libavl/Makefile.in
@ -170,6 +170,7 @@ SPL_VERSION = @SPL_VERSION@
 STRIP = @STRIP@
 TARGET_ASM_DIR = @TARGET_ASM_DIR@
 TOPDIR = @TOPDIR@
+USERDEBUG = @USERDEBUG@
 VERSION = @VERSION@
 ZFS_CONFIG = @ZFS_CONFIG@
 ZFS_META_ALIAS = @ZFS_META_ALIAS@
@ -236,7 +237,7 @@ DEFAULT_INCLUDES = -I${top_srcdir} -I${top_srcdir}/module/avl/include \

 # Expected defines not covered by zfs_config.h or spl_config.h
 AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing -Werror \
-	-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
+	-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT $(USERDEBUG) \
 	-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
 	-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
 lib_LTLIBRARIES = libavl.la
--- a/lib/libefi/Makefile.in
+++ b/lib/libefi/Makefile.in
@ -170,6 +170,7 @@ SPL_VERSION = @SPL_VERSION@
 STRIP = @STRIP@
 TARGET_ASM_DIR = @TARGET_ASM_DIR@
 TOPDIR = @TOPDIR@
+USERDEBUG = @USERDEBUG@
 VERSION = @VERSION@
 ZFS_CONFIG = @ZFS_CONFIG@
 ZFS_META_ALIAS = @ZFS_META_ALIAS@
@ -236,7 +237,7 @@ DEFAULT_INCLUDES = -I${top_srcdir} -I${top_srcdir}/lib/libefi/include \

 # Expected defines not covered by zfs_config.h or spl_config.h
 AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing -Werror \
-	-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
+	-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT $(USERDEBUG) \
 	-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
 	-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
 lib_LTLIBRARIES = libefi.la
--- a/lib/libnvpair/Makefile.in
+++ b/lib/libnvpair/Makefile.in
@ -171,6 +171,7 @@ SPL_VERSION = @SPL_VERSION@
 STRIP = @STRIP@
 TARGET_ASM_DIR = @TARGET_ASM_DIR@
 TOPDIR = @TOPDIR@
+USERDEBUG = @USERDEBUG@
 VERSION = @VERSION@
 ZFS_CONFIG = @ZFS_CONFIG@
 ZFS_META_ALIAS = @ZFS_META_ALIAS@
@ -239,7 +240,7 @@ DEFAULT_INCLUDES = -I${top_srcdir} \

 # Expected defines not covered by zfs_config.h or spl_config.h
 AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing -Werror \
-	-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
+	-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT $(USERDEBUG) \
 	-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
 	-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
 lib_LTLIBRARIES = libnvpair.la
--- a/lib/libspl/Makefile.in
+++ b/lib/libspl/Makefile.in
@ -181,6 +181,7 @@ SPL_VERSION = @SPL_VERSION@
 STRIP = @STRIP@
 TARGET_ASM_DIR = @TARGET_ASM_DIR@
 TOPDIR = @TOPDIR@
+USERDEBUG = @USERDEBUG@
 VERSION = @VERSION@
 ZFS_CONFIG = @ZFS_CONFIG@
 ZFS_META_ALIAS = @ZFS_META_ALIAS@
@ -246,7 +247,7 @@ DEFAULT_INCLUDES = -I${top_srcdir} -I${top_srcdir}/lib/libspl/include

 # Expected defines not covered by zfs_config.h or spl_config.h
 AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing -Werror \
-	-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
+	-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT $(USERDEBUG) \
 	-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
 	-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
 SUBDIRS = include $(TARGET_ASM_DIR)
--- a/lib/libspl/asm-generic/Makefile.in
+++ b/lib/libspl/asm-generic/Makefile.in
@ -145,6 +145,7 @@ SPL_VERSION = @SPL_VERSION@
 STRIP = @STRIP@
 TARGET_ASM_DIR = @TARGET_ASM_DIR@
 TOPDIR = @TOPDIR@
+USERDEBUG = @USERDEBUG@
 VERSION = @VERSION@
 ZFS_CONFIG = @ZFS_CONFIG@
 ZFS_META_ALIAS = @ZFS_META_ALIAS@
@ -210,7 +211,7 @@ DEFAULT_INCLUDES = -I${top_srcdir} -I${top_srcdir}/lib/libspl/include

 # Expected defines not covered by zfs_config.h or spl_config.h
 AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing -Werror \
-	-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
+	-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT $(USERDEBUG) \
 	-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
 	-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
 atomic_SOURCE = atomic.c
--- a/lib/libspl/asm-i386/Makefile.in
+++ b/lib/libspl/asm-i386/Makefile.in
@ -149,6 +149,7 @@ SPL_VERSION = @SPL_VERSION@
 STRIP = @STRIP@
 TARGET_ASM_DIR = @TARGET_ASM_DIR@
 TOPDIR = @TOPDIR@
+USERDEBUG = @USERDEBUG@
 VERSION = @VERSION@
 ZFS_CONFIG = @ZFS_CONFIG@
 ZFS_META_ALIAS = @ZFS_META_ALIAS@
--- a/lib/libspl/asm-x86_64/Makefile.in
+++ b/lib/libspl/asm-x86_64/Makefile.in
@ -149,6 +149,7 @@ SPL_VERSION = @SPL_VERSION@
 STRIP = @STRIP@
 TARGET_ASM_DIR = @TARGET_ASM_DIR@
 TOPDIR = @TOPDIR@
+USERDEBUG = @USERDEBUG@
 VERSION = @VERSION@
 ZFS_CONFIG = @ZFS_CONFIG@
 ZFS_META_ALIAS = @ZFS_META_ALIAS@
--- a/lib/libspl/include/Makefile.in
+++ b/lib/libspl/include/Makefile.in
@ -157,6 +157,7 @@ SPL_VERSION = @SPL_VERSION@
 STRIP = @STRIP@
 TARGET_ASM_DIR = @TARGET_ASM_DIR@
 TOPDIR = @TOPDIR@
+USERDEBUG = @USERDEBUG@
 VERSION = @VERSION@
 ZFS_CONFIG = @ZFS_CONFIG@
 ZFS_META_ALIAS = @ZFS_META_ALIAS@
--- a/lib/libunicode/Makefile.in
+++ b/lib/libunicode/Makefile.in
@ -170,6 +170,7 @@ SPL_VERSION = @SPL_VERSION@
 STRIP = @STRIP@
 TARGET_ASM_DIR = @TARGET_ASM_DIR@
 TOPDIR = @TOPDIR@
+USERDEBUG = @USERDEBUG@
 VERSION = @VERSION@
 ZFS_CONFIG = @ZFS_CONFIG@
 ZFS_META_ALIAS = @ZFS_META_ALIAS@
@ -237,7 +238,7 @@ DEFAULT_INCLUDES = -I${top_srcdir} \

 # Expected defines not covered by zfs_config.h or spl_config.h
 AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing -Werror \
-	-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
+	-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT $(USERDEBUG) \
 	-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
 	-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
 lib_LTLIBRARIES = libunicode.la
--- a/lib/libuutil/Makefile.in
+++ b/lib/libuutil/Makefile.in
@ -172,6 +172,7 @@ SPL_VERSION = @SPL_VERSION@
 STRIP = @STRIP@
 TARGET_ASM_DIR = @TARGET_ASM_DIR@
 TOPDIR = @TOPDIR@
+USERDEBUG = @USERDEBUG@
 VERSION = @VERSION@
 ZFS_CONFIG = @ZFS_CONFIG@
 ZFS_META_ALIAS = @ZFS_META_ALIAS@
@ -240,7 +241,7 @@ DEFAULT_INCLUDES = -I${top_srcdir} \

 # Expected defines not covered by zfs_config.h or spl_config.h
 AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing -Werror \
-	-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
+	-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT $(USERDEBUG) \
 	-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
 	-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
 lib_LTLIBRARIES = libuutil.la
--- a/lib/libzfs/Makefile.in
+++ b/lib/libzfs/Makefile.in
@ -173,6 +173,7 @@ SPL_VERSION = @SPL_VERSION@
 STRIP = @STRIP@
 TARGET_ASM_DIR = @TARGET_ASM_DIR@
 TOPDIR = @TOPDIR@
+USERDEBUG = @USERDEBUG@
 VERSION = @VERSION@
 ZFS_CONFIG = @ZFS_CONFIG@
 ZFS_META_ALIAS = @ZFS_META_ALIAS@
@ -248,7 +249,7 @@ DEFAULT_INCLUDES = -I${top_srcdir} -I${top_srcdir}/lib/libzfs/include \

 # Expected defines not covered by zfs_config.h or spl_config.h
 AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing -Werror \
-	-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
+	-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT $(USERDEBUG) \
 	-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
 	-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
 lib_LTLIBRARIES = libzfs.la
--- a/lib/libzpool/Makefile.in
+++ b/lib/libzpool/Makefile.in
@ -190,6 +190,7 @@ SPL_VERSION = @SPL_VERSION@
 STRIP = @STRIP@
 TARGET_ASM_DIR = @TARGET_ASM_DIR@
 TOPDIR = @TOPDIR@
+USERDEBUG = @USERDEBUG@
 VERSION = @VERSION@
 ZFS_CONFIG = @ZFS_CONFIG@
 ZFS_META_ALIAS = @ZFS_META_ALIAS@
@ -263,7 +264,7 @@ DEFAULT_INCLUDES = -I${top_srcdir} \

 # Expected defines not covered by zfs_config.h or spl_config.h
 AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing -Werror \
-	-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
+	-D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT $(USERDEBUG) \
 	-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
 	-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
 SUBDIRS = include
--- a/lib/libzpool/include/Makefile.in
+++ b/lib/libzpool/include/Makefile.in
@ -157,6 +157,7 @@ SPL_VERSION = @SPL_VERSION@
 STRIP = @STRIP@
 TARGET_ASM_DIR = @TARGET_ASM_DIR@
 TOPDIR = @TOPDIR@
+USERDEBUG = @USERDEBUG@
 VERSION = @VERSION@
 ZFS_CONFIG = @ZFS_CONFIG@
 ZFS_META_ALIAS = @ZFS_META_ALIAS@
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@ -154,6 +154,7 @@ SPL_VERSION = @SPL_VERSION@
 STRIP = @STRIP@
 TARGET_ASM_DIR = @TARGET_ASM_DIR@
 TOPDIR = @TOPDIR@
+USERDEBUG = @USERDEBUG@
 VERSION = @VERSION@
 ZFS_CONFIG = @ZFS_CONFIG@
 ZFS_META_ALIAS = @ZFS_META_ALIAS@
--- a/zfs_config.h.in
+++ b/zfs_config.h.in
@ -1,5 +1,8 @@
 /* zfs_config.h.in.  Generated from configure.ac by autoheader.  */

+/* Define to 1 to enable debug tracing */
+#undef DEBUG
+
 /* invalidate_bdev() wants 1 arg */
 #undef HAVE_1ARG_INVALIDATE_BDEV