Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

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

This commit is contained in:
Brian Behlendorf 2009-10-23 12:35:42 -07:00
parent 5125a4fc74 f11e5e26e2
commit d4842bbc1c
27 changed files with 68 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.in
View File

@ -181,6 +181,7 @@ SPL_VERSION = @SPL_VERSION@
STRIP = @STRIP@ STRIP = @STRIP@
TARGET_ASM_DIR = @TARGET_ASM_DIR@ TARGET_ASM_DIR = @TARGET_ASM_DIR@
TOPDIR = @TOPDIR@ TOPDIR = @TOPDIR@
USERDEBUG = @USERDEBUG@
VERSION = @VERSION@ VERSION = @VERSION@
ZFS_CONFIG = @ZFS_CONFIG@ ZFS_CONFIG = @ZFS_CONFIG@
ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_ALIAS = @ZFS_META_ALIAS@

1
cmd/Makefile.in
View File

@ -153,6 +153,7 @@ SPL_VERSION = @SPL_VERSION@
STRIP = @STRIP@ STRIP = @STRIP@
TARGET_ASM_DIR = @TARGET_ASM_DIR@ TARGET_ASM_DIR = @TARGET_ASM_DIR@
TOPDIR = @TOPDIR@ TOPDIR = @TOPDIR@
USERDEBUG = @USERDEBUG@
VERSION = @VERSION@ VERSION = @VERSION@
ZFS_CONFIG = @ZFS_CONFIG@ ZFS_CONFIG = @ZFS_CONFIG@
ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_ALIAS = @ZFS_META_ALIAS@

3
cmd/zdb/Makefile.in
View File

@ -172,6 +172,7 @@ SPL_VERSION = @SPL_VERSION@
STRIP = @STRIP@ STRIP = @STRIP@
TARGET_ASM_DIR = @TARGET_ASM_DIR@ TARGET_ASM_DIR = @TARGET_ASM_DIR@
TOPDIR = @TOPDIR@ TOPDIR = @TOPDIR@
USERDEBUG = @USERDEBUG@
VERSION = @VERSION@ VERSION = @VERSION@
ZFS_CONFIG = @ZFS_CONFIG@ ZFS_CONFIG = @ZFS_CONFIG@
ZFS_META_ALIAS = @ZFS_META_ALIAS@ 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 # Expected defines not covered by zfs_config.h or spl_config.h
AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing -Werror \ 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_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
zdb_SOURCES = \ zdb_SOURCES = \

3
cmd/zfs/Makefile.in
View File

@ -172,6 +172,7 @@ SPL_VERSION = @SPL_VERSION@
STRIP = @STRIP@ STRIP = @STRIP@
TARGET_ASM_DIR = @TARGET_ASM_DIR@ TARGET_ASM_DIR = @TARGET_ASM_DIR@
TOPDIR = @TOPDIR@ TOPDIR = @TOPDIR@
USERDEBUG = @USERDEBUG@
VERSION = @VERSION@ VERSION = @VERSION@
ZFS_CONFIG = @ZFS_CONFIG@ ZFS_CONFIG = @ZFS_CONFIG@
ZFS_META_ALIAS = @ZFS_META_ALIAS@ 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 # Expected defines not covered by zfs_config.h or spl_config.h
AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing -Werror \ 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_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
zfs_SOURCES = \ zfs_SOURCES = \

3
cmd/zinject/Makefile.in
View File

@ -172,6 +172,7 @@ SPL_VERSION = @SPL_VERSION@
STRIP = @STRIP@ STRIP = @STRIP@
TARGET_ASM_DIR = @TARGET_ASM_DIR@ TARGET_ASM_DIR = @TARGET_ASM_DIR@
TOPDIR = @TOPDIR@ TOPDIR = @TOPDIR@
USERDEBUG = @USERDEBUG@
VERSION = @VERSION@ VERSION = @VERSION@
ZFS_CONFIG = @ZFS_CONFIG@ ZFS_CONFIG = @ZFS_CONFIG@
ZFS_META_ALIAS = @ZFS_META_ALIAS@ 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 # Expected defines not covered by zfs_config.h or spl_config.h
AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing -Werror \ 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_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
zinject_SOURCES = \ zinject_SOURCES = \

3
cmd/zpios/Makefile.in
View File

@ -165,6 +165,7 @@ SPL_VERSION = @SPL_VERSION@
STRIP = @STRIP@ STRIP = @STRIP@
TARGET_ASM_DIR = @TARGET_ASM_DIR@ TARGET_ASM_DIR = @TARGET_ASM_DIR@
TOPDIR = @TOPDIR@ TOPDIR = @TOPDIR@
USERDEBUG = @USERDEBUG@
VERSION = @VERSION@ VERSION = @VERSION@
ZFS_CONFIG = @ZFS_CONFIG@ ZFS_CONFIG = @ZFS_CONFIG@
ZFS_META_ALIAS = @ZFS_META_ALIAS@ 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 # Expected defines not covered by zfs_config.h or spl_config.h
AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing -Werror \ 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_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
zpios_SOURCES = \ zpios_SOURCES = \

3
cmd/zpool/Makefile.in
View File

@ -173,6 +173,7 @@ SPL_VERSION = @SPL_VERSION@
STRIP = @STRIP@ STRIP = @STRIP@
TARGET_ASM_DIR = @TARGET_ASM_DIR@ TARGET_ASM_DIR = @TARGET_ASM_DIR@
TOPDIR = @TOPDIR@ TOPDIR = @TOPDIR@
USERDEBUG = @USERDEBUG@
VERSION = @VERSION@ VERSION = @VERSION@
ZFS_CONFIG = @ZFS_CONFIG@ ZFS_CONFIG = @ZFS_CONFIG@
ZFS_META_ALIAS = @ZFS_META_ALIAS@ 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 # Expected defines not covered by zfs_config.h or spl_config.h
AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing -Werror \ 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_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
zpool_SOURCES = \ zpool_SOURCES = \

3
cmd/ztest/Makefile.in
View File

@ -172,6 +172,7 @@ SPL_VERSION = @SPL_VERSION@
STRIP = @STRIP@ STRIP = @STRIP@
TARGET_ASM_DIR = @TARGET_ASM_DIR@ TARGET_ASM_DIR = @TARGET_ASM_DIR@
TOPDIR = @TOPDIR@ TOPDIR = @TOPDIR@
USERDEBUG = @USERDEBUG@
VERSION = @VERSION@ VERSION = @VERSION@
ZFS_CONFIG = @ZFS_CONFIG@ ZFS_CONFIG = @ZFS_CONFIG@
ZFS_META_ALIAS = @ZFS_META_ALIAS@ 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 # Expected defines not covered by zfs_config.h or spl_config.h
AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing -Werror \ 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_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
ztest_SOURCES = \ ztest_SOURCES = \

1
config/Makefile.in
View File

@ -145,6 +145,7 @@ SPL_VERSION = @SPL_VERSION@
STRIP = @STRIP@ STRIP = @STRIP@
TARGET_ASM_DIR = @TARGET_ASM_DIR@ TARGET_ASM_DIR = @TARGET_ASM_DIR@
TOPDIR = @TOPDIR@ TOPDIR = @TOPDIR@
USERDEBUG = @USERDEBUG@
VERSION = @VERSION@ VERSION = @VERSION@
ZFS_CONFIG = @ZFS_CONFIG@ ZFS_CONFIG = @ZFS_CONFIG@
ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_ALIAS = @ZFS_META_ALIAS@

40
configure vendored
View File

@ -462,7 +462,7 @@ ac_includes_default="\
# include <unistd.h> # include <unistd.h>
#endif" #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='' ac_subst_files=''
# Initialize some variables set by options. # Initialize some variables set by options.
@ -22451,38 +22451,47 @@ EOF
echo "$as_me:$LINENO: checking whether debugging is enabled" >&5 echo "$as_me:$LINENO: checking whether debugging is enabled" >&5
echo $ECHO_N "checking whether debugging is enabled... $ECHO_C" >&6 echo $ECHO_N "checking whether debugging is enabled... $ECHO_C" >&6
# Check whether --enable-debug or --disable-debug was given. # Check whether --enable-debug or --disable-debug was given.
if test "${enable_debug+set}" = set; then if test "${enable_debug+set}" = set; then
enableval="$enable_debug" enableval="$enable_debug"
case "$enableval" in case "$enableval" in
yes) zfs_ac_debug=yes ;; yes) zfs_ac_debug=yes ;;
no) zfs_ac_debug=no ;; no) zfs_ac_debug=no ;;
*) echo "$as_me:$LINENO: result: Error!" >&5 *) echo "$as_me:$LINENO: result: Error!" >&5
echo "${ECHO_T}Error!" >&6 echo "${ECHO_T}Error!" >&6
{ { echo "$as_me:$LINENO: error: Bad value \"$enableval\" for --enable-debug" >&5 { { echo "$as_me:$LINENO: error: Bad value \"$enableval\" for --enable-debug" >&5
echo "$as_me: error: Bad value \"$enableval\" for --enable-debug" >&2;} echo "$as_me: error: Bad value \"$enableval\" for --enable-debug" >&2;}
{ (exit 1); exit 1; }; } ;; { (exit 1); exit 1; }; } ;;
esac esac
fi; fi;
if test "$zfs_ac_debug" = yes; then if test "$zfs_ac_debug" = yes; then
echo "$as_me:$LINENO: result: yes" >&5 echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6 echo "${ECHO_T}yes" >&6
KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG "
cat >>confdefs.h <<\_ACEOF
#define DEBUG 1
_ACEOF
KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG "
HOSTCFLAGS="${HOSTCFLAGS} -DDEBUG " HOSTCFLAGS="${HOSTCFLAGS} -DDEBUG "
else USERDEBUG="-DDEBUG"
echo "$as_me:$LINENO: result: no" >&5 else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6 echo "${ECHO_T}no" >&6
cat >>confdefs.h <<\_ACEOF cat >>confdefs.h <<\_ACEOF
#define NDEBUG 1 #define NDEBUG 1
_ACEOF _ACEOF
KERNELCPPFLAGS="${KERNELCPPFLAGS} -DNDEBUG " KERNELCPPFLAGS="${KERNELCPPFLAGS} -DNDEBUG "
HOSTCFLAGS="${HOSTCFLAGS} -DNDEBUG " HOSTCFLAGS="${HOSTCFLAGS} -DNDEBUG "
fi 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" 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_USER_FALSE@,$CONFIG_USER_FALSE,;t t
s,@CONFIG_KERNEL_TRUE@,$CONFIG_KERNEL_TRUE,;t t s,@CONFIG_KERNEL_TRUE@,$CONFIG_KERNEL_TRUE,;t t
s,@CONFIG_KERNEL_FALSE@,$CONFIG_KERNEL_FALSE,;t t s,@CONFIG_KERNEL_FALSE@,$CONFIG_KERNEL_FALSE,;t t
s,@USERDEBUG@,$USERDEBUG,;t t
s,@LIBOBJS@,$LIBOBJS,;t t s,@LIBOBJS@,$LIBOBJS,;t t
s,@LTLIBOBJS@,$LTLIBOBJS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t
CEOF CEOF

1
doc/Makefile.in
View File

@ -144,6 +144,7 @@ SPL_VERSION = @SPL_VERSION@
STRIP = @STRIP@ STRIP = @STRIP@
TARGET_ASM_DIR = @TARGET_ASM_DIR@ TARGET_ASM_DIR = @TARGET_ASM_DIR@
TOPDIR = @TOPDIR@ TOPDIR = @TOPDIR@
USERDEBUG = @USERDEBUG@
VERSION = @VERSION@ VERSION = @VERSION@
ZFS_CONFIG = @ZFS_CONFIG@ ZFS_CONFIG = @ZFS_CONFIG@
ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_ALIAS = @ZFS_META_ALIAS@

1
lib/Makefile.in
View File

@ -153,6 +153,7 @@ SPL_VERSION = @SPL_VERSION@
STRIP = @STRIP@ STRIP = @STRIP@
TARGET_ASM_DIR = @TARGET_ASM_DIR@ TARGET_ASM_DIR = @TARGET_ASM_DIR@
TOPDIR = @TOPDIR@ TOPDIR = @TOPDIR@
USERDEBUG = @USERDEBUG@
VERSION = @VERSION@ VERSION = @VERSION@
ZFS_CONFIG = @ZFS_CONFIG@ ZFS_CONFIG = @ZFS_CONFIG@
ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_ALIAS = @ZFS_META_ALIAS@

3
lib/libavl/Makefile.in
View File

@ -170,6 +170,7 @@ SPL_VERSION = @SPL_VERSION@
STRIP = @STRIP@ STRIP = @STRIP@
TARGET_ASM_DIR = @TARGET_ASM_DIR@ TARGET_ASM_DIR = @TARGET_ASM_DIR@
TOPDIR = @TOPDIR@ TOPDIR = @TOPDIR@
USERDEBUG = @USERDEBUG@
VERSION = @VERSION@ VERSION = @VERSION@
ZFS_CONFIG = @ZFS_CONFIG@ ZFS_CONFIG = @ZFS_CONFIG@
ZFS_META_ALIAS = @ZFS_META_ALIAS@ 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 # Expected defines not covered by zfs_config.h or spl_config.h
AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing -Werror \ 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_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
lib_LTLIBRARIES = libavl.la lib_LTLIBRARIES = libavl.la

3
lib/libefi/Makefile.in
View File

@ -170,6 +170,7 @@ SPL_VERSION = @SPL_VERSION@
STRIP = @STRIP@ STRIP = @STRIP@
TARGET_ASM_DIR = @TARGET_ASM_DIR@ TARGET_ASM_DIR = @TARGET_ASM_DIR@
TOPDIR = @TOPDIR@ TOPDIR = @TOPDIR@
USERDEBUG = @USERDEBUG@
VERSION = @VERSION@ VERSION = @VERSION@
ZFS_CONFIG = @ZFS_CONFIG@ ZFS_CONFIG = @ZFS_CONFIG@
ZFS_META_ALIAS = @ZFS_META_ALIAS@ 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 # Expected defines not covered by zfs_config.h or spl_config.h
AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing -Werror \ 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_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
lib_LTLIBRARIES = libefi.la lib_LTLIBRARIES = libefi.la

3
lib/libnvpair/Makefile.in
View File

@ -171,6 +171,7 @@ SPL_VERSION = @SPL_VERSION@
STRIP = @STRIP@ STRIP = @STRIP@
TARGET_ASM_DIR = @TARGET_ASM_DIR@ TARGET_ASM_DIR = @TARGET_ASM_DIR@
TOPDIR = @TOPDIR@ TOPDIR = @TOPDIR@
USERDEBUG = @USERDEBUG@
VERSION = @VERSION@ VERSION = @VERSION@
ZFS_CONFIG = @ZFS_CONFIG@ ZFS_CONFIG = @ZFS_CONFIG@
ZFS_META_ALIAS = @ZFS_META_ALIAS@ 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 # Expected defines not covered by zfs_config.h or spl_config.h
AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing -Werror \ 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_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
lib_LTLIBRARIES = libnvpair.la lib_LTLIBRARIES = libnvpair.la

3
lib/libspl/Makefile.in
View File

@ -181,6 +181,7 @@ SPL_VERSION = @SPL_VERSION@
STRIP = @STRIP@ STRIP = @STRIP@
TARGET_ASM_DIR = @TARGET_ASM_DIR@ TARGET_ASM_DIR = @TARGET_ASM_DIR@
TOPDIR = @TOPDIR@ TOPDIR = @TOPDIR@
USERDEBUG = @USERDEBUG@
VERSION = @VERSION@ VERSION = @VERSION@
ZFS_CONFIG = @ZFS_CONFIG@ ZFS_CONFIG = @ZFS_CONFIG@
ZFS_META_ALIAS = @ZFS_META_ALIAS@ 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 # Expected defines not covered by zfs_config.h or spl_config.h
AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing -Werror \ 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_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
SUBDIRS = include $(TARGET_ASM_DIR) SUBDIRS = include $(TARGET_ASM_DIR)

3
lib/libspl/asm-generic/Makefile.in
View File

@ -145,6 +145,7 @@ SPL_VERSION = @SPL_VERSION@
STRIP = @STRIP@ STRIP = @STRIP@
TARGET_ASM_DIR = @TARGET_ASM_DIR@ TARGET_ASM_DIR = @TARGET_ASM_DIR@
TOPDIR = @TOPDIR@ TOPDIR = @TOPDIR@
USERDEBUG = @USERDEBUG@
VERSION = @VERSION@ VERSION = @VERSION@
ZFS_CONFIG = @ZFS_CONFIG@ ZFS_CONFIG = @ZFS_CONFIG@
ZFS_META_ALIAS = @ZFS_META_ALIAS@ 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 # Expected defines not covered by zfs_config.h or spl_config.h
AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing -Werror \ 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_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
atomic_SOURCE = atomic.c atomic_SOURCE = atomic.c

1
lib/libspl/asm-i386/Makefile.in
View File

@ -149,6 +149,7 @@ SPL_VERSION = @SPL_VERSION@
STRIP = @STRIP@ STRIP = @STRIP@
TARGET_ASM_DIR = @TARGET_ASM_DIR@ TARGET_ASM_DIR = @TARGET_ASM_DIR@
TOPDIR = @TOPDIR@ TOPDIR = @TOPDIR@
USERDEBUG = @USERDEBUG@
VERSION = @VERSION@ VERSION = @VERSION@
ZFS_CONFIG = @ZFS_CONFIG@ ZFS_CONFIG = @ZFS_CONFIG@
ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_ALIAS = @ZFS_META_ALIAS@

1
lib/libspl/asm-x86_64/Makefile.in
View File

@ -149,6 +149,7 @@ SPL_VERSION = @SPL_VERSION@
STRIP = @STRIP@ STRIP = @STRIP@
TARGET_ASM_DIR = @TARGET_ASM_DIR@ TARGET_ASM_DIR = @TARGET_ASM_DIR@
TOPDIR = @TOPDIR@ TOPDIR = @TOPDIR@
USERDEBUG = @USERDEBUG@
VERSION = @VERSION@ VERSION = @VERSION@
ZFS_CONFIG = @ZFS_CONFIG@ ZFS_CONFIG = @ZFS_CONFIG@
ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_ALIAS = @ZFS_META_ALIAS@

1
lib/libspl/include/Makefile.in
View File

@ -157,6 +157,7 @@ SPL_VERSION = @SPL_VERSION@
STRIP = @STRIP@ STRIP = @STRIP@
TARGET_ASM_DIR = @TARGET_ASM_DIR@ TARGET_ASM_DIR = @TARGET_ASM_DIR@
TOPDIR = @TOPDIR@ TOPDIR = @TOPDIR@
USERDEBUG = @USERDEBUG@
VERSION = @VERSION@ VERSION = @VERSION@
ZFS_CONFIG = @ZFS_CONFIG@ ZFS_CONFIG = @ZFS_CONFIG@
ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_ALIAS = @ZFS_META_ALIAS@

3
lib/libunicode/Makefile.in
View File

@ -170,6 +170,7 @@ SPL_VERSION = @SPL_VERSION@
STRIP = @STRIP@ STRIP = @STRIP@
TARGET_ASM_DIR = @TARGET_ASM_DIR@ TARGET_ASM_DIR = @TARGET_ASM_DIR@
TOPDIR = @TOPDIR@ TOPDIR = @TOPDIR@
USERDEBUG = @USERDEBUG@
VERSION = @VERSION@ VERSION = @VERSION@
ZFS_CONFIG = @ZFS_CONFIG@ ZFS_CONFIG = @ZFS_CONFIG@
ZFS_META_ALIAS = @ZFS_META_ALIAS@ 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 # Expected defines not covered by zfs_config.h or spl_config.h
AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing -Werror \ 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_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
lib_LTLIBRARIES = libunicode.la lib_LTLIBRARIES = libunicode.la

3
lib/libuutil/Makefile.in
View File

@ -172,6 +172,7 @@ SPL_VERSION = @SPL_VERSION@
STRIP = @STRIP@ STRIP = @STRIP@
TARGET_ASM_DIR = @TARGET_ASM_DIR@ TARGET_ASM_DIR = @TARGET_ASM_DIR@
TOPDIR = @TOPDIR@ TOPDIR = @TOPDIR@
USERDEBUG = @USERDEBUG@
VERSION = @VERSION@ VERSION = @VERSION@
ZFS_CONFIG = @ZFS_CONFIG@ ZFS_CONFIG = @ZFS_CONFIG@
ZFS_META_ALIAS = @ZFS_META_ALIAS@ 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 # Expected defines not covered by zfs_config.h or spl_config.h
AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing -Werror \ 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_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
lib_LTLIBRARIES = libuutil.la lib_LTLIBRARIES = libuutil.la

3
lib/libzfs/Makefile.in
View File

@ -173,6 +173,7 @@ SPL_VERSION = @SPL_VERSION@
STRIP = @STRIP@ STRIP = @STRIP@
TARGET_ASM_DIR = @TARGET_ASM_DIR@ TARGET_ASM_DIR = @TARGET_ASM_DIR@
TOPDIR = @TOPDIR@ TOPDIR = @TOPDIR@
USERDEBUG = @USERDEBUG@
VERSION = @VERSION@ VERSION = @VERSION@
ZFS_CONFIG = @ZFS_CONFIG@ ZFS_CONFIG = @ZFS_CONFIG@
ZFS_META_ALIAS = @ZFS_META_ALIAS@ 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 # Expected defines not covered by zfs_config.h or spl_config.h
AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing -Werror \ 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_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
lib_LTLIBRARIES = libzfs.la lib_LTLIBRARIES = libzfs.la

3
lib/libzpool/Makefile.in
View File

@ -190,6 +190,7 @@ SPL_VERSION = @SPL_VERSION@
STRIP = @STRIP@ STRIP = @STRIP@
TARGET_ASM_DIR = @TARGET_ASM_DIR@ TARGET_ASM_DIR = @TARGET_ASM_DIR@
TOPDIR = @TOPDIR@ TOPDIR = @TOPDIR@
USERDEBUG = @USERDEBUG@
VERSION = @VERSION@ VERSION = @VERSION@
ZFS_CONFIG = @ZFS_CONFIG@ ZFS_CONFIG = @ZFS_CONFIG@
ZFS_META_ALIAS = @ZFS_META_ALIAS@ 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 # Expected defines not covered by zfs_config.h or spl_config.h
AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing -Werror \ 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_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
SUBDIRS = include SUBDIRS = include

1
lib/libzpool/include/Makefile.in
View File

@ -157,6 +157,7 @@ SPL_VERSION = @SPL_VERSION@
STRIP = @STRIP@ STRIP = @STRIP@
TARGET_ASM_DIR = @TARGET_ASM_DIR@ TARGET_ASM_DIR = @TARGET_ASM_DIR@
TOPDIR = @TOPDIR@ TOPDIR = @TOPDIR@
USERDEBUG = @USERDEBUG@
VERSION = @VERSION@ VERSION = @VERSION@
ZFS_CONFIG = @ZFS_CONFIG@ ZFS_CONFIG = @ZFS_CONFIG@
ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_ALIAS = @ZFS_META_ALIAS@

1
scripts/Makefile.in
View File

@ -154,6 +154,7 @@ SPL_VERSION = @SPL_VERSION@
STRIP = @STRIP@ STRIP = @STRIP@
TARGET_ASM_DIR = @TARGET_ASM_DIR@ TARGET_ASM_DIR = @TARGET_ASM_DIR@
TOPDIR = @TOPDIR@ TOPDIR = @TOPDIR@
USERDEBUG = @USERDEBUG@
VERSION = @VERSION@ VERSION = @VERSION@
ZFS_CONFIG = @ZFS_CONFIG@ ZFS_CONFIG = @ZFS_CONFIG@
ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_ALIAS = @ZFS_META_ALIAS@

3
zfs_config.h.in
View File

@ -1,5 +1,8 @@
/* zfs_config.h.in. Generated from configure.ac by autoheader. */ /* zfs_config.h.in. Generated from configure.ac by autoheader. */
/* Define to 1 to enable debug tracing */
#undef DEBUG
/* invalidate_bdev() wants 1 arg */ /* invalidate_bdev() wants 1 arg */
#undef HAVE_1ARG_INVALIDATE_BDEV #undef HAVE_1ARG_INVALIDATE_BDEV