diff --git a/META b/META index 0a5132f..95c9368 100644 --- a/META +++ b/META @@ -1,7 +1,7 @@ Meta: 1 Name: spl Branch: 1.0 -Version: 0.7.8 +Version: 0.7.9 Release: 1 Release-Tags: relext License: GPL diff --git a/Makefile.in b/Makefile.in index d24ca1c..2a94d10 100644 --- a/Makefile.in +++ b/Makefile.in @@ -79,9 +79,8 @@ DIST_COMMON = $(am__configure_deps) $(am__extra_HEADERS_DIST) \ $(top_srcdir)/module/Makefile.in \ $(top_srcdir)/module/spl/Makefile.in \ $(top_srcdir)/module/splat/Makefile.in AUTHORS COPYING \ - config/compile config/config.guess config/config.sub \ - config/depcomp config/install-sh config/ltmain.sh \ - config/missing + config/config.guess config/config.sub config/depcomp \ + config/install-sh config/ltmain.sh config/missing @CONFIG_USER_TRUE@am__append_1 = lib cmd man scripts @CONFIG_KERNEL_TRUE@am__append_2 = module subdir = . diff --git a/config/compile b/config/compile deleted file mode 100755 index 2ab71e4..0000000 --- a/config/compile +++ /dev/null @@ -1,348 +0,0 @@ -#! /bin/sh -# Wrapper for compilers which do not understand '-c -o'. - -scriptversion=2016-01-11.22; # UTC - -# Copyright (C) 1999-2017 Free Software Foundation, Inc. -# Written by Tom Tromey . -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# This file is maintained in Automake, please report -# bugs to or send patches to -# . - -nl=' -' - -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent tools from complaining about whitespace usage. -IFS=" "" $nl" - -file_conv= - -# func_file_conv build_file lazy -# Convert a $build file to $host form and store it in $file -# Currently only supports Windows hosts. If the determined conversion -# type is listed in (the comma separated) LAZY, no conversion will -# take place. -func_file_conv () -{ - file=$1 - case $file in - / | /[!/]*) # absolute file, and not a UNC file - if test -z "$file_conv"; then - # lazily determine how to convert abs files - case `uname -s` in - MINGW*) - file_conv=mingw - ;; - CYGWIN*) - file_conv=cygwin - ;; - *) - file_conv=wine - ;; - esac - fi - case $file_conv/,$2, in - *,$file_conv,*) - ;; - mingw/*) - file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` - ;; - cygwin/*) - file=`cygpath -m "$file" || echo "$file"` - ;; - wine/*) - file=`winepath -w "$file" || echo "$file"` - ;; - esac - ;; - esac -} - -# func_cl_dashL linkdir -# Make cl look for libraries in LINKDIR -func_cl_dashL () -{ - func_file_conv "$1" - if test -z "$lib_path"; then - lib_path=$file - else - lib_path="$lib_path;$file" - fi - linker_opts="$linker_opts -LIBPATH:$file" -} - -# func_cl_dashl library -# Do a library search-path lookup for cl -func_cl_dashl () -{ - lib=$1 - found=no - save_IFS=$IFS - IFS=';' - for dir in $lib_path $LIB - do - IFS=$save_IFS - if $shared && test -f "$dir/$lib.dll.lib"; then - found=yes - lib=$dir/$lib.dll.lib - break - fi - if test -f "$dir/$lib.lib"; then - found=yes - lib=$dir/$lib.lib - break - fi - if test -f "$dir/lib$lib.a"; then - found=yes - lib=$dir/lib$lib.a - break - fi - done - IFS=$save_IFS - - if test "$found" != yes; then - lib=$lib.lib - fi -} - -# func_cl_wrapper cl arg... -# Adjust compile command to suit cl -func_cl_wrapper () -{ - # Assume a capable shell - lib_path= - shared=: - linker_opts= - for arg - do - if test -n "$eat"; then - eat= - else - case $1 in - -o) - # configure might choose to run compile as 'compile cc -o foo foo.c'. - eat=1 - case $2 in - *.o | *.[oO][bB][jJ]) - func_file_conv "$2" - set x "$@" -Fo"$file" - shift - ;; - *) - func_file_conv "$2" - set x "$@" -Fe"$file" - shift - ;; - esac - ;; - -I) - eat=1 - func_file_conv "$2" mingw - set x "$@" -I"$file" - shift - ;; - -I*) - func_file_conv "${1#-I}" mingw - set x "$@" -I"$file" - shift - ;; - -l) - eat=1 - func_cl_dashl "$2" - set x "$@" "$lib" - shift - ;; - -l*) - func_cl_dashl "${1#-l}" - set x "$@" "$lib" - shift - ;; - -L) - eat=1 - func_cl_dashL "$2" - ;; - -L*) - func_cl_dashL "${1#-L}" - ;; - -static) - shared=false - ;; - -Wl,*) - arg=${1#-Wl,} - save_ifs="$IFS"; IFS=',' - for flag in $arg; do - IFS="$save_ifs" - linker_opts="$linker_opts $flag" - done - IFS="$save_ifs" - ;; - -Xlinker) - eat=1 - linker_opts="$linker_opts $2" - ;; - -*) - set x "$@" "$1" - shift - ;; - *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) - func_file_conv "$1" - set x "$@" -Tp"$file" - shift - ;; - *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) - func_file_conv "$1" mingw - set x "$@" "$file" - shift - ;; - *) - set x "$@" "$1" - shift - ;; - esac - fi - shift - done - if test -n "$linker_opts"; then - linker_opts="-link$linker_opts" - fi - exec "$@" $linker_opts - exit 1 -} - -eat= - -case $1 in - '') - echo "$0: No command. Try '$0 --help' for more information." 1>&2 - exit 1; - ;; - -h | --h*) - cat <<\EOF -Usage: compile [--help] [--version] PROGRAM [ARGS] - -Wrapper for compilers which do not understand '-c -o'. -Remove '-o dest.o' from ARGS, run PROGRAM with the remaining -arguments, and rename the output as expected. - -If you are trying to build a whole package this is not the -right script to run: please start by reading the file 'INSTALL'. - -Report bugs to . -EOF - exit $? - ;; - -v | --v*) - echo "compile $scriptversion" - exit $? - ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ - icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) - func_cl_wrapper "$@" # Doesn't return... - ;; -esac - -ofile= -cfile= - -for arg -do - if test -n "$eat"; then - eat= - else - case $1 in - -o) - # configure might choose to run compile as 'compile cc -o foo foo.c'. - # So we strip '-o arg' only if arg is an object. - eat=1 - case $2 in - *.o | *.obj) - ofile=$2 - ;; - *) - set x "$@" -o "$2" - shift - ;; - esac - ;; - *.c) - cfile=$1 - set x "$@" "$1" - shift - ;; - *) - set x "$@" "$1" - shift - ;; - esac - fi - shift -done - -if test -z "$ofile" || test -z "$cfile"; then - # If no '-o' option was seen then we might have been invoked from a - # pattern rule where we don't need one. That is ok -- this is a - # normal compilation that the losing compiler can handle. If no - # '.c' file was seen then we are probably linking. That is also - # ok. - exec "$@" -fi - -# Name of file we expect compiler to create. -cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` - -# Create the lock directory. -# Note: use '[/\\:.-]' here to ensure that we don't use the same name -# that we are using for the .o file. Also, base the name on the expected -# object file name, since that is what matters with a parallel build. -lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d -while true; do - if mkdir "$lockdir" >/dev/null 2>&1; then - break - fi - sleep 1 -done -# FIXME: race condition here if user kills between mkdir and trap. -trap "rmdir '$lockdir'; exit 1" 1 2 15 - -# Run the compile. -"$@" -ret=$? - -if test -f "$cofile"; then - test "$cofile" = "$ofile" || mv "$cofile" "$ofile" -elif test -f "${cofile}bj"; then - test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" -fi - -rmdir "$lockdir" -exit $ret - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC0" -# time-stamp-end: "; # UTC" -# End: diff --git a/config/spl-build.m4 b/config/spl-build.m4 index 9c97e64..5c6c02a 100644 --- a/config/spl-build.m4 +++ b/config/spl-build.m4 @@ -17,9 +17,6 @@ AC_DEFUN([SPL_AC_CONFIG_KERNEL], [ KERNELCPPFLAGS="$KERNELCPPFLAGS -Wstrict-prototypes" AC_SUBST(KERNELCPPFLAGS) - SPL_AC_DEBUG - SPL_AC_DEBUG_KMEM - SPL_AC_DEBUG_KMEM_TRACKING SPL_AC_TEST_MODULE SPL_AC_ATOMIC_SPINLOCK SPL_AC_SHRINKER_CALLBACK @@ -228,7 +225,9 @@ AC_DEFUN([SPL_AC_RPM], [ AC_MSG_RESULT([$HAVE_RPMBUILD]) ]) - RPM_DEFINE_COMMON='--define "$(DEBUG_SPL) 1" --define "$(DEBUG_KMEM) 1" --define "$(DEBUG_KMEM_TRACKING) 1"' + RPM_DEFINE_COMMON='--define "$(DEBUG_SPL) 1"' + RPM_DEFINE_COMMON+=' --define "$(DEBUG_KMEM) 1"' + RPM_DEFINE_COMMON+=' --define "$(DEBUG_KMEM_TRACKING) 1"' RPM_DEFINE_UTIL= RPM_DEFINE_KMOD='--define "kernels $(LINUX_VERSION)"' RPM_DEFINE_KMOD+=' --define "_wrong_version_format_terminate_build 0"' diff --git a/configure b/configure index dac28de..7c40f9b 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for spl 0.7.8. +# Generated by GNU Autoconf 2.63 for spl 0.7.9. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. @@ -743,8 +743,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='spl' PACKAGE_TARNAME='spl' -PACKAGE_VERSION='0.7.8' -PACKAGE_STRING='spl 0.7.8' +PACKAGE_VERSION='0.7.9' +PACKAGE_STRING='spl 0.7.9' PACKAGE_BUGREPORT='' # Factoring default headers for most tests. @@ -787,14 +787,14 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS -CONFIG_KERNEL_FALSE -CONFIG_KERNEL_TRUE -CONFIG_USER_FALSE -CONFIG_USER_TRUE DEBUG_KMEM_TRACKING DEBUG_KMEM DEBUG_SPL DEBUG_CFLAGS +CONFIG_KERNEL_FALSE +CONFIG_KERNEL_TRUE +CONFIG_USER_FALSE +CONFIG_USER_TRUE KERNELCPPFLAGS KERNELMAKE_PARAMS LINUX_SYMBOLS @@ -969,10 +969,10 @@ with_config enable_linux_builtin with_linux with_linux_obj +enable_atomic_spinlocks enable_debug enable_debug_kmem enable_debug_kmem_tracking -enable_atomic_spinlocks ' ac_precious_vars='build_alias host_alias @@ -1535,7 +1535,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures spl 0.7.8 to adapt to many kinds of systems. +\`configure' configures spl 0.7.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1606,7 +1606,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of spl 0.7.8:";; + short | recursive ) echo "Configuration of spl 0.7.9:";; esac cat <<\_ACEOF @@ -1627,12 +1627,12 @@ Optional Features: --disable-libtool-lock avoid locking (might break parallel builds) --enable-linux-builtin Configure for builtin in-tree kernel modules [default=no] + --enable-atomic-spinlocks + Atomic types use spinlocks [default=check] --enable-debug Enable generic debug support [default=no] --enable-debug-kmem Enable basic kmem accounting [default=no] --enable-debug-kmem-tracking Enable detailed kmem tracking [default=no] - --enable-atomic-spinlocks - Atomic types use spinlocks [default=check] Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1720,7 +1720,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -spl configure 0.7.8 +spl configure 0.7.9 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1734,7 +1734,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by spl $as_me 0.7.8, which was +It was created by spl $as_me 0.7.9, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2888,7 +2888,7 @@ fi # Define the identity of the package. PACKAGE='spl' - VERSION='0.7.8' + VERSION='0.7.9' cat >>confdefs.h <<_ACEOF @@ -11562,7 +11562,9 @@ $as_echo "$HAVE_RPMBUILD" >&6; } fi - RPM_DEFINE_COMMON='--define "$(DEBUG_SPL) 1" --define "$(DEBUG_KMEM) 1" --define "$(DEBUG_KMEM_TRACKING) 1"' + RPM_DEFINE_COMMON='--define "$(DEBUG_SPL) 1"' + RPM_DEFINE_COMMON+=' --define "$(DEBUG_KMEM) 1"' + RPM_DEFINE_COMMON+=' --define "$(DEBUG_KMEM_TRACKING) 1"' RPM_DEFINE_UTIL= RPM_DEFINE_KMOD='--define "kernels $(LINUX_VERSION)"' RPM_DEFINE_KMOD+=' --define "_wrong_version_format_terminate_build 0"' @@ -11873,101 +11875,6 @@ $as_echo "$LINUX_SYMBOLS" >&6; } KERNELCPPFLAGS="$KERNELCPPFLAGS -Wstrict-prototypes" - - { $as_echo "$as_me:$LINENO: checking whether debugging is enabled" >&5 -$as_echo_n "checking whether debugging is enabled... " >&6; } - # Check whether --enable-debug was given. -if test "${enable_debug+set}" = set; then - enableval=$enable_debug; -else - enable_debug=no -fi - - - if test "x$enable_debug" = xyes; then - - KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG -Werror" - DEBUG_CFLAGS="-DDEBUG -Werror" - DEBUG_SPL="_with_debug" - -else - - KERNELCPPFLAGS="${KERNELCPPFLAGS} -DNDEBUG" - DEBUG_CFLAGS="-DNDEBUG" - DEBUG_SPL="_without_debug" - -fi - - - - - { $as_echo "$as_me:$LINENO: result: $enable_debug" >&5 -$as_echo "$enable_debug" >&6; } - - - # Check whether --enable-debug-kmem was given. -if test "${enable_debug_kmem+set}" = set; then - enableval=$enable_debug_kmem; -else - enable_debug_kmem=no -fi - - - if test "x$enable_debug_kmem" = xyes; then - - KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG_KMEM" - DEBUG_KMEM="_with_debug_kmem" - -cat >>confdefs.h <<\_ACEOF -#define DEBUG_KMEM 1 -_ACEOF - - -else - - DEBUG_KMEM="_without_debug_kmem" - -fi - - - - { $as_echo "$as_me:$LINENO: checking whether basic kmem accounting is enabled" >&5 -$as_echo_n "checking whether basic kmem accounting is enabled... " >&6; } - { $as_echo "$as_me:$LINENO: result: $enable_debug_kmem" >&5 -$as_echo "$enable_debug_kmem" >&6; } - - - # Check whether --enable-debug-kmem-tracking was given. -if test "${enable_debug_kmem_tracking+set}" = set; then - enableval=$enable_debug_kmem_tracking; -else - enable_debug_kmem_tracking=no -fi - - - if test "x$enable_debug_kmem_tracking" = xyes; then - - KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG_KMEM_TRACKING" - DEBUG_KMEM_TRACKING="_with_debug_kmem_tracking" - -cat >>confdefs.h <<\_ACEOF -#define DEBUG_KMEM_TRACKING 1 -_ACEOF - - -else - - DEBUG_KMEM_TRACKING="_without_debug_kmem_tracking" - -fi - - - - { $as_echo "$as_me:$LINENO: checking whether detailed kmem tracking is enabled" >&5 -$as_echo_n "checking whether detailed kmem tracking is enabled... " >&6; } - { $as_echo "$as_me:$LINENO: result: $enable_debug_kmem_tracking" >&5 -$as_echo "$enable_debug_kmem_tracking" >&6; } - { $as_echo "$as_me:$LINENO: checking whether modules can be built" >&5 $as_echo_n "checking whether modules can be built... " >&6; } @@ -15444,101 +15351,6 @@ $as_echo "$LINUX_SYMBOLS" >&6; } KERNELCPPFLAGS="$KERNELCPPFLAGS -Wstrict-prototypes" - - { $as_echo "$as_me:$LINENO: checking whether debugging is enabled" >&5 -$as_echo_n "checking whether debugging is enabled... " >&6; } - # Check whether --enable-debug was given. -if test "${enable_debug+set}" = set; then - enableval=$enable_debug; -else - enable_debug=no -fi - - - if test "x$enable_debug" = xyes; then - - KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG -Werror" - DEBUG_CFLAGS="-DDEBUG -Werror" - DEBUG_SPL="_with_debug" - -else - - KERNELCPPFLAGS="${KERNELCPPFLAGS} -DNDEBUG" - DEBUG_CFLAGS="-DNDEBUG" - DEBUG_SPL="_without_debug" - -fi - - - - - { $as_echo "$as_me:$LINENO: result: $enable_debug" >&5 -$as_echo "$enable_debug" >&6; } - - - # Check whether --enable-debug-kmem was given. -if test "${enable_debug_kmem+set}" = set; then - enableval=$enable_debug_kmem; -else - enable_debug_kmem=no -fi - - - if test "x$enable_debug_kmem" = xyes; then - - KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG_KMEM" - DEBUG_KMEM="_with_debug_kmem" - -cat >>confdefs.h <<\_ACEOF -#define DEBUG_KMEM 1 -_ACEOF - - -else - - DEBUG_KMEM="_without_debug_kmem" - -fi - - - - { $as_echo "$as_me:$LINENO: checking whether basic kmem accounting is enabled" >&5 -$as_echo_n "checking whether basic kmem accounting is enabled... " >&6; } - { $as_echo "$as_me:$LINENO: result: $enable_debug_kmem" >&5 -$as_echo "$enable_debug_kmem" >&6; } - - - # Check whether --enable-debug-kmem-tracking was given. -if test "${enable_debug_kmem_tracking+set}" = set; then - enableval=$enable_debug_kmem_tracking; -else - enable_debug_kmem_tracking=no -fi - - - if test "x$enable_debug_kmem_tracking" = xyes; then - - KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG_KMEM_TRACKING" - DEBUG_KMEM_TRACKING="_with_debug_kmem_tracking" - -cat >>confdefs.h <<\_ACEOF -#define DEBUG_KMEM_TRACKING 1 -_ACEOF - - -else - - DEBUG_KMEM_TRACKING="_without_debug_kmem_tracking" - -fi - - - - { $as_echo "$as_me:$LINENO: checking whether detailed kmem tracking is enabled" >&5 -$as_echo_n "checking whether detailed kmem tracking is enabled... " >&6; } - { $as_echo "$as_me:$LINENO: result: $enable_debug_kmem_tracking" >&5 -$as_echo "$enable_debug_kmem_tracking" >&6; } - { $as_echo "$as_me:$LINENO: checking whether modules can be built" >&5 $as_echo_n "checking whether modules can be built... " >&6; } @@ -18874,7 +18686,102 @@ fi -ac_config_files="$ac_config_files Makefile man/Makefile man/man1/Makefile man/man5/Makefile lib/Makefile cmd/Makefile cmd/splat/Makefile cmd/splslab/Makefile module/Makefile module/spl/Makefile module/splat/Makefile include/Makefile include/fs/Makefile include/linux/Makefile include/rpc/Makefile include/sharefs/Makefile include/sys/Makefile include/sys/fm/Makefile include/sys/fs/Makefile include/sys/sysevent/Makefile include/util/Makefile include/vm/Makefile scripts/Makefile rpm/Makefile rpm/redhat/Makefile rpm/redhat/spl.spec rpm/redhat/spl-kmod.spec rpm/redhat/spl-dkms.spec rpm/generic/Makefile rpm/generic/spl.spec rpm/generic/spl-kmod.spec rpm/generic/spl-dkms.spec spl.release" + { $as_echo "$as_me:$LINENO: checking whether debugging is enabled" >&5 +$as_echo_n "checking whether debugging is enabled... " >&6; } + # Check whether --enable-debug was given. +if test "${enable_debug+set}" = set; then + enableval=$enable_debug; +else + enable_debug=no +fi + + + if test "x$enable_debug" = xyes; then + + KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG -Werror" + DEBUG_CFLAGS="-DDEBUG -Werror" + DEBUG_SPL="_with_debug" + +else + + KERNELCPPFLAGS="${KERNELCPPFLAGS} -DNDEBUG" + DEBUG_CFLAGS="-DNDEBUG" + DEBUG_SPL="_without_debug" + +fi + + + + + { $as_echo "$as_me:$LINENO: result: $enable_debug" >&5 +$as_echo "$enable_debug" >&6; } + + + # Check whether --enable-debug-kmem was given. +if test "${enable_debug_kmem+set}" = set; then + enableval=$enable_debug_kmem; +else + enable_debug_kmem=no +fi + + + if test "x$enable_debug_kmem" = xyes; then + + KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG_KMEM" + DEBUG_KMEM="_with_debug_kmem" + +cat >>confdefs.h <<\_ACEOF +#define DEBUG_KMEM 1 +_ACEOF + + +else + + DEBUG_KMEM="_without_debug_kmem" + +fi + + + + { $as_echo "$as_me:$LINENO: checking whether basic kmem accounting is enabled" >&5 +$as_echo_n "checking whether basic kmem accounting is enabled... " >&6; } + { $as_echo "$as_me:$LINENO: result: $enable_debug_kmem" >&5 +$as_echo "$enable_debug_kmem" >&6; } + + + # Check whether --enable-debug-kmem-tracking was given. +if test "${enable_debug_kmem_tracking+set}" = set; then + enableval=$enable_debug_kmem_tracking; +else + enable_debug_kmem_tracking=no +fi + + + if test "x$enable_debug_kmem_tracking" = xyes; then + + KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG_KMEM_TRACKING" + DEBUG_KMEM_TRACKING="_with_debug_kmem_tracking" + +cat >>confdefs.h <<\_ACEOF +#define DEBUG_KMEM_TRACKING 1 +_ACEOF + + +else + + DEBUG_KMEM_TRACKING="_without_debug_kmem_tracking" + +fi + + + + { $as_echo "$as_me:$LINENO: checking whether detailed kmem tracking is enabled" >&5 +$as_echo_n "checking whether detailed kmem tracking is enabled... " >&6; } + { $as_echo "$as_me:$LINENO: result: $enable_debug_kmem_tracking" >&5 +$as_echo "$enable_debug_kmem_tracking" >&6; } + + +ac_config_files="$ac_config_files Makefile man/Makefile man/man1/Makefile man/man5/Makefile lib/Makefile cmd/Makefile cmd/splat/Makefile cmd/splslab/Makefile module/Makefile module/spl/Makefile module/splat/Makefile include/Makefile include/fs/Makefile include/linux/Makefile include/rpc/Makefile include/sharefs/Makefile include/sys/Makefile include/sys/fm/Makefile include/sys/fs/Makefile include/util/Makefile include/vm/Makefile scripts/Makefile rpm/Makefile rpm/redhat/Makefile rpm/redhat/spl.spec rpm/redhat/spl-kmod.spec rpm/redhat/spl-dkms.spec rpm/generic/Makefile rpm/generic/spl.spec rpm/generic/spl-kmod.spec rpm/generic/spl-dkms.spec spl.release" cat >confcache <<\_ACEOF @@ -19339,7 +19246,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by spl $as_me 0.7.8, which was +This file was extended by spl $as_me 0.7.9, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -19402,7 +19309,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -spl config.status 0.7.8 +spl config.status 0.7.9 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -19802,7 +19709,6 @@ do "include/sys/Makefile") CONFIG_FILES="$CONFIG_FILES include/sys/Makefile" ;; "include/sys/fm/Makefile") CONFIG_FILES="$CONFIG_FILES include/sys/fm/Makefile" ;; "include/sys/fs/Makefile") CONFIG_FILES="$CONFIG_FILES include/sys/fs/Makefile" ;; - "include/sys/sysevent/Makefile") CONFIG_FILES="$CONFIG_FILES include/sys/sysevent/Makefile" ;; "include/util/Makefile") CONFIG_FILES="$CONFIG_FILES include/util/Makefile" ;; "include/vm/Makefile") CONFIG_FILES="$CONFIG_FILES include/vm/Makefile" ;; "scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;; diff --git a/configure.ac b/configure.ac index 70735ce..ab53879 100644 --- a/configure.ac +++ b/configure.ac @@ -46,6 +46,9 @@ AC_PROG_LIBTOOL SPL_AC_LICENSE SPL_AC_PACKAGE SPL_AC_CONFIG +SPL_AC_DEBUG +SPL_AC_DEBUG_KMEM +SPL_AC_DEBUG_KMEM_TRACKING AC_CONFIG_FILES([ Makefile @@ -67,7 +70,6 @@ AC_CONFIG_FILES([ include/sys/Makefile include/sys/fm/Makefile include/sys/fs/Makefile - include/sys/sysevent/Makefile include/util/Makefile include/vm/Makefile scripts/Makefile diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am index a16bd6c..45b6589 100644 --- a/include/sys/Makefile.am +++ b/include/sys/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = fm fs sysevent +SUBDIRS = fm fs COMMON_H = @@ -77,7 +77,6 @@ KERNEL_H = \ $(top_srcdir)/include/sys/sunddi.h \ $(top_srcdir)/include/sys/sunldi.h \ $(top_srcdir)/include/sys/sysdc.h \ - $(top_srcdir)/include/sys/sysevent.h \ $(top_srcdir)/include/sys/sysmacros.h \ $(top_srcdir)/include/sys/systeminfo.h \ $(top_srcdir)/include/sys/systm.h \ diff --git a/include/sys/Makefile.in b/include/sys/Makefile.in index 7b30b02..5c61b0f 100644 --- a/include/sys/Makefile.in +++ b/include/sys/Makefile.in @@ -162,7 +162,6 @@ am__kernel_HEADERS_DIST = $(top_srcdir)/include/sys/acl.h \ $(top_srcdir)/include/sys/sunddi.h \ $(top_srcdir)/include/sys/sunldi.h \ $(top_srcdir)/include/sys/sysdc.h \ - $(top_srcdir)/include/sys/sysevent.h \ $(top_srcdir)/include/sys/sysmacros.h \ $(top_srcdir)/include/sys/systeminfo.h \ $(top_srcdir)/include/sys/systm.h \ @@ -408,7 +407,7 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = fm fs sysevent +SUBDIRS = fm fs COMMON_H = KERNEL_H = \ $(top_srcdir)/include/sys/acl.h \ @@ -485,7 +484,6 @@ KERNEL_H = \ $(top_srcdir)/include/sys/sunddi.h \ $(top_srcdir)/include/sys/sunldi.h \ $(top_srcdir)/include/sys/sysdc.h \ - $(top_srcdir)/include/sys/sysevent.h \ $(top_srcdir)/include/sys/sysmacros.h \ $(top_srcdir)/include/sys/systeminfo.h \ $(top_srcdir)/include/sys/systm.h \ diff --git a/include/sys/sunldi.h b/include/sys/sunldi.h index 3f7f9b3..af5d54c 100644 --- a/include/sys/sunldi.h +++ b/include/sys/sunldi.h @@ -32,6 +32,12 @@ #include #include +/* + * SECTOR_SIZE can be defined in blkdev.h. See + * https://github.com/torvalds/linux/commit/233bde21. + */ +#ifndef SECTOR_SIZE #define SECTOR_SIZE 512 +#endif #endif /* SPL_SUNLDI_H */ diff --git a/include/sys/sysevent.h b/include/sys/sysevent.h deleted file mode 100644 index 5a7ca41..0000000 --- a/include/sys/sysevent.h +++ /dev/null @@ -1,28 +0,0 @@ -/*****************************************************************************\ - * Copyright (C) 2007-2010 Lawrence Livermore National Security, LLC. - * Copyright (C) 2007 The Regents of the University of California. - * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). - * Written by Brian Behlendorf . - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see . - * - * The SPL is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * The SPL is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * for more details. - * - * You should have received a copy of the GNU General Public License along - * with the SPL. If not, see . -\*****************************************************************************/ - -#ifndef _SPL_SYSEVENT_H -#define _SPL_SYSEVENT_H - -#endif /* _SPL_SYSEVENT_H */ diff --git a/include/sys/sysevent/Makefile.am b/include/sys/sysevent/Makefile.am deleted file mode 100644 index 63d9af3..0000000 --- a/include/sys/sysevent/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -COMMON_H = - -KERNEL_H = \ - $(top_srcdir)/include/sys/sysevent/eventdefs.h - -USER_H = - -EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - -if CONFIG_KERNEL -kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/sysevent -kernel_HEADERS = $(KERNEL_H) -endif diff --git a/include/sys/sysevent/Makefile.in b/include/sys/sysevent/Makefile.in deleted file mode 100644 index 3d618e7..0000000 --- a/include/sys/sysevent/Makefile.in +++ /dev/null @@ -1,542 +0,0 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -target_triplet = @target@ -subdir = include/sys/sysevent -DIST_COMMON = $(am__kernel_HEADERS_DIST) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/config/kernel-ctl-table-name.m4 \ - $(top_srcdir)/config/kernel-fallocate.m4 \ - $(top_srcdir)/config/kernel-group-info.m4 \ - $(top_srcdir)/config/kernel-inode-lock.m4 \ - $(top_srcdir)/config/kernel-kmem-cache.m4 \ - $(top_srcdir)/config/kernel-kuidgid.m4 \ - $(top_srcdir)/config/kernel-pde-data.m4 \ - $(top_srcdir)/config/kernel-rw.m4 \ - $(top_srcdir)/config/kernel-rwsem.m4 \ - $(top_srcdir)/config/kernel-sched.m4 \ - $(top_srcdir)/config/kernel-set-fs-pwd.m4 \ - $(top_srcdir)/config/kernel-shrinker.m4 \ - $(top_srcdir)/config/kernel-spinlock.m4 \ - $(top_srcdir)/config/kernel-timer.m4 \ - $(top_srcdir)/config/kernel-trim-unused-symbols.m4 \ - $(top_srcdir)/config/kernel-truncate-range.m4 \ - $(top_srcdir)/config/kernel-urange-sleep.m4 \ - $(top_srcdir)/config/kernel-vfs-fsync.m4 \ - $(top_srcdir)/config/kernel-vfs-getattr.m4 \ - $(top_srcdir)/config/kernel-wait.m4 \ - $(top_srcdir)/config/kernel-zlib.m4 \ - $(top_srcdir)/config/libtool.m4 \ - $(top_srcdir)/config/ltoptions.m4 \ - $(top_srcdir)/config/ltsugar.m4 \ - $(top_srcdir)/config/ltversion.m4 \ - $(top_srcdir)/config/lt~obsolete.m4 \ - $(top_srcdir)/config/spl-build.m4 \ - $(top_srcdir)/config/spl-meta.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/spl_config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) -am__v_at_0 = @ -SOURCES = -DIST_SOURCES = -am__kernel_HEADERS_DIST = \ - $(top_srcdir)/include/sys/sysevent/eventdefs.h -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(kerneldir)" -HEADERS = $(kernel_HEADERS) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALIEN = @ALIEN@ -ALIEN_VERSION = @ALIEN_VERSION@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEBUG_CFLAGS = @DEBUG_CFLAGS@ -DEBUG_KMEM = @DEBUG_KMEM@ -DEBUG_KMEM_TRACKING = @DEBUG_KMEM_TRACKING@ -DEBUG_SPL = @DEBUG_SPL@ -DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DPKG = @DPKG@ -DPKGBUILD = @DPKGBUILD@ -DPKGBUILD_VERSION = @DPKGBUILD_VERSION@ -DPKG_VERSION = @DPKG_VERSION@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GREP = @GREP@ -HAVE_ALIEN = @HAVE_ALIEN@ -HAVE_DPKG = @HAVE_DPKG@ -HAVE_DPKGBUILD = @HAVE_DPKGBUILD@ -HAVE_RPM = @HAVE_RPM@ -HAVE_RPMBUILD = @HAVE_RPMBUILD@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -KERNELCPPFLAGS = @KERNELCPPFLAGS@ -KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LINUX = @LINUX@ -LINUX_OBJ = @LINUX_OBJ@ -LINUX_SYMBOLS = @LINUX_SYMBOLS@ -LINUX_VERSION = @LINUX_VERSION@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -RELEASE = @RELEASE@ -RPM = @RPM@ -RPMBUILD = @RPMBUILD@ -RPMBUILD_VERSION = @RPMBUILD_VERSION@ -RPM_DEFINE_COMMON = @RPM_DEFINE_COMMON@ -RPM_DEFINE_DKMS = @RPM_DEFINE_DKMS@ -RPM_DEFINE_KMOD = @RPM_DEFINE_KMOD@ -RPM_DEFINE_UTIL = @RPM_DEFINE_UTIL@ -RPM_SPEC_DIR = @RPM_SPEC_DIR@ -RPM_VERSION = @RPM_VERSION@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SPL_CONFIG = @SPL_CONFIG@ -SPL_META_ALIAS = @SPL_META_ALIAS@ -SPL_META_AUTHOR = @SPL_META_AUTHOR@ -SPL_META_DATA = @SPL_META_DATA@ -SPL_META_LICENSE = @SPL_META_LICENSE@ -SPL_META_LT_AGE = @SPL_META_LT_AGE@ -SPL_META_LT_CURRENT = @SPL_META_LT_CURRENT@ -SPL_META_LT_REVISION = @SPL_META_LT_REVISION@ -SPL_META_NAME = @SPL_META_NAME@ -SPL_META_RELEASE = @SPL_META_RELEASE@ -SPL_META_VERSION = @SPL_META_VERSION@ -SRPM_DEFINE_COMMON = @SRPM_DEFINE_COMMON@ -SRPM_DEFINE_DKMS = @SRPM_DEFINE_DKMS@ -SRPM_DEFINE_KMOD = @SRPM_DEFINE_KMOD@ -SRPM_DEFINE_UTIL = @SRPM_DEFINE_UTIL@ -STRIP = @STRIP@ -VENDOR = @VENDOR@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -COMMON_H = -KERNEL_H = \ - $(top_srcdir)/include/sys/sysevent/eventdefs.h - -USER_H = -EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) -@CONFIG_KERNEL_TRUE@kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/sysevent -@CONFIG_KERNEL_TRUE@kernel_HEADERS = $(KERNEL_H) -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/sys/sysevent/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu include/sys/sysevent/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -install-kernelHEADERS: $(kernel_HEADERS) - @$(NORMAL_INSTALL) - test -z "$(kerneldir)" || $(MKDIR_P) "$(DESTDIR)$(kerneldir)" - @list='$(kernel_HEADERS)'; test -n "$(kerneldir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(kerneldir)'"; \ - $(INSTALL_HEADER) $$files "$(DESTDIR)$(kerneldir)" || exit $$?; \ - done - -uninstall-kernelHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(kernel_HEADERS)'; test -n "$(kerneldir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(kerneldir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(kerneldir)" && rm -f $$files - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(HEADERS) -installdirs: - for dir in "$(DESTDIR)$(kerneldir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: install-kernelHEADERS - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-kernelHEADERS - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool ctags distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-kernelHEADERS install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-kernelHEADERS - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/include/sys/sysevent/eventdefs.h b/include/sys/sysevent/eventdefs.h deleted file mode 100644 index 592c78a..0000000 --- a/include/sys/sysevent/eventdefs.h +++ /dev/null @@ -1,28 +0,0 @@ -/*****************************************************************************\ - * Copyright (C) 2007-2010 Lawrence Livermore National Security, LLC. - * Copyright (C) 2007 The Regents of the University of California. - * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). - * Written by Brian Behlendorf . - * UCRL-CODE-235197 - * - * This file is part of the SPL, Solaris Porting Layer. - * For details, see . - * - * The SPL is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * The SPL is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * for more details. - * - * You should have received a copy of the GNU General Public License along - * with the SPL. If not, see . -\*****************************************************************************/ - -#ifndef _SPL_SYSEVENT_EVENTDEFS_H -#define _SPL_SYSEVENT_EVENTDEFS_H - -#endif /* _SPL_SYSEVENT_EVENTDEFS_H */ diff --git a/module/spl/spl.mod.c b/module/spl/spl.mod.c deleted file mode 100644 index 42445b7..0000000 --- a/module/spl/spl.mod.c +++ /dev/null @@ -1,190 +0,0 @@ -#include -#include -#include - -MODULE_INFO(vermagic, VERMAGIC_STRING); - -struct module __this_module -__attribute__((section(".gnu.linkonce.this_module"))) = { - .name = KBUILD_MODNAME, - .init = init_module, -#ifdef CONFIG_MODULE_UNLOAD - .exit = cleanup_module, -#endif - .arch = MODULE_ARCH_INIT, -}; - -static const struct modversion_info ____versions[] -__used -__attribute__((section("__versions"))) = { - { 0x28950ef1, __VMLINUX_SYMBOL_STR(module_layout) }, - { 0x6a5fa363, __VMLINUX_SYMBOL_STR(sigprocmask) }, - { 0xacfa5975, __VMLINUX_SYMBOL_STR(kmem_cache_destroy) }, - { 0x98ab5c8d, __VMLINUX_SYMBOL_STR(kmalloc_caches) }, - { 0x65e75cb6, __VMLINUX_SYMBOL_STR(__list_del_entry) }, - { 0xd2b09ce5, __VMLINUX_SYMBOL_STR(__kmalloc) }, - { 0x5aeb145f, __VMLINUX_SYMBOL_STR(complete_and_exit) }, - { 0x107e5878, __VMLINUX_SYMBOL_STR(zlib_inflateEnd) }, - { 0x1ed8b599, __VMLINUX_SYMBOL_STR(__x86_indirect_thunk_r8) }, - { 0xf5893abf, __VMLINUX_SYMBOL_STR(up_read) }, - { 0x4c4fef19, __VMLINUX_SYMBOL_STR(kernel_stack) }, - { 0x784213a6, __VMLINUX_SYMBOL_STR(pv_lock_ops) }, - { 0x628121e9, __VMLINUX_SYMBOL_STR(register_sysctl_table) }, - { 0x68cd4849, __VMLINUX_SYMBOL_STR(inode_permission) }, - { 0x4b7dcf38, __VMLINUX_SYMBOL_STR(_raw_qspin_lock) }, - { 0x15692c87, __VMLINUX_SYMBOL_STR(param_ops_int) }, - { 0xa0fbac79, __VMLINUX_SYMBOL_STR(wake_up_bit) }, - { 0x754d539c, __VMLINUX_SYMBOL_STR(strlen) }, - { 0x257f3887, __VMLINUX_SYMBOL_STR(seq_open) }, - { 0xc8b57c27, __VMLINUX_SYMBOL_STR(autoremove_wake_function) }, - { 0x263ed23b, __VMLINUX_SYMBOL_STR(__x86_indirect_thunk_r12) }, - { 0x930484aa, __VMLINUX_SYMBOL_STR(cpu_online_mask) }, - { 0x79aa04a2, __VMLINUX_SYMBOL_STR(get_random_bytes) }, - { 0xb5dcab5b, __VMLINUX_SYMBOL_STR(remove_wait_queue) }, - { 0x50612798, __VMLINUX_SYMBOL_STR(seq_puts) }, - { 0xd067fc5c, __VMLINUX_SYMBOL_STR(proc_dointvec) }, - { 0xb54533f7, __VMLINUX_SYMBOL_STR(usecs_to_jiffies) }, - { 0x20000329, __VMLINUX_SYMBOL_STR(simple_strtoul) }, - { 0xc0a3d105, __VMLINUX_SYMBOL_STR(find_next_bit) }, - { 0x74df1d4, __VMLINUX_SYMBOL_STR(seq_printf) }, - { 0xa16aae11, __VMLINUX_SYMBOL_STR(remove_proc_entry) }, - { 0x61aa871a, __VMLINUX_SYMBOL_STR(filp_close) }, - { 0x593a99b, __VMLINUX_SYMBOL_STR(init_timer_key) }, - { 0xf8983de7, __VMLINUX_SYMBOL_STR(prepare_to_wait_exclusive) }, - { 0x4ed12f73, __VMLINUX_SYMBOL_STR(mutex_unlock) }, - { 0x6def63e1, __VMLINUX_SYMBOL_STR(vfs_fsync) }, - { 0x999e8297, __VMLINUX_SYMBOL_STR(vfree) }, - { 0x54efb5d6, __VMLINUX_SYMBOL_STR(cpu_number) }, - { 0x95dad3f2, __VMLINUX_SYMBOL_STR(path_get) }, - { 0x9c3df9b4, __VMLINUX_SYMBOL_STR(seq_read) }, - { 0xc35e4b4e, __VMLINUX_SYMBOL_STR(kthread_create_on_node) }, - { 0x7d11c268, __VMLINUX_SYMBOL_STR(jiffies) }, - { 0x343a1a8, __VMLINUX_SYMBOL_STR(__list_add) }, - { 0x57a6ccd0, __VMLINUX_SYMBOL_STR(down_read) }, - { 0xe2d5255a, __VMLINUX_SYMBOL_STR(strcmp) }, - { 0xd2258c, __VMLINUX_SYMBOL_STR(kthread_bind) }, - { 0xf432dd3d, __VMLINUX_SYMBOL_STR(__init_waitqueue_head) }, - { 0x71de9b3f, __VMLINUX_SYMBOL_STR(_copy_to_user) }, - { 0xffd5a395, __VMLINUX_SYMBOL_STR(default_wake_function) }, - { 0x44f0d59d, __VMLINUX_SYMBOL_STR(PDE_DATA) }, - { 0xfe7c4287, __VMLINUX_SYMBOL_STR(nr_cpu_ids) }, - { 0x35b6b772, __VMLINUX_SYMBOL_STR(param_ops_charp) }, - { 0x8062d53f, __VMLINUX_SYMBOL_STR(vfs_read) }, - { 0xd5f2172f, __VMLINUX_SYMBOL_STR(del_timer_sync) }, - { 0xfb578fc5, __VMLINUX_SYMBOL_STR(memset) }, - { 0x73839c7a, __VMLINUX_SYMBOL_STR(proc_mkdir) }, - { 0x11089ac7, __VMLINUX_SYMBOL_STR(_ctype) }, - { 0x8f64aa4, __VMLINUX_SYMBOL_STR(_raw_spin_unlock_irqrestore) }, - { 0xb8c7ff88, __VMLINUX_SYMBOL_STR(current_task) }, - { 0x9a025cd5, __VMLINUX_SYMBOL_STR(__mutex_init) }, - { 0x27e1a049, __VMLINUX_SYMBOL_STR(printk) }, - { 0xe15f42bb, __VMLINUX_SYMBOL_STR(_raw_spin_trylock) }, - { 0x42f90a31, __VMLINUX_SYMBOL_STR(kthread_stop) }, - { 0x449ad0a7, __VMLINUX_SYMBOL_STR(memcmp) }, - { 0x7c1372e8, __VMLINUX_SYMBOL_STR(panic) }, - { 0xe7b00dfb, __VMLINUX_SYMBOL_STR(__x86_indirect_thunk_r13) }, - { 0xa1c76e0a, __VMLINUX_SYMBOL_STR(_cond_resched) }, - { 0x4d9b652b, __VMLINUX_SYMBOL_STR(rb_erase) }, - { 0x9166fada, __VMLINUX_SYMBOL_STR(strncpy) }, - { 0x9725b589, __VMLINUX_SYMBOL_STR(proc_doulongvec_minmax) }, - { 0xce5ac24f, __VMLINUX_SYMBOL_STR(zlib_inflate_workspacesize) }, - { 0x5a921311, __VMLINUX_SYMBOL_STR(strncmp) }, - { 0x5792f848, __VMLINUX_SYMBOL_STR(strlcpy) }, - { 0x19ee3d71, __VMLINUX_SYMBOL_STR(kmem_cache_free) }, - { 0x93a6e0b2, __VMLINUX_SYMBOL_STR(io_schedule) }, - { 0x16305289, __VMLINUX_SYMBOL_STR(warn_slowpath_null) }, - { 0x9abdea30, __VMLINUX_SYMBOL_STR(mutex_lock) }, - { 0x521445b, __VMLINUX_SYMBOL_STR(list_del) }, - { 0x1e6d26a8, __VMLINUX_SYMBOL_STR(strstr) }, - { 0xce8b1878, __VMLINUX_SYMBOL_STR(__x86_indirect_thunk_r14) }, - { 0xbe2c0274, __VMLINUX_SYMBOL_STR(add_timer) }, - { 0xf0f1246c, __VMLINUX_SYMBOL_STR(kvasprintf) }, - { 0xa07a37f0, __VMLINUX_SYMBOL_STR(memchr) }, - { 0x5a0b73d0, __VMLINUX_SYMBOL_STR(zlib_deflateInit2) }, - { 0x3b4ceb4a, __VMLINUX_SYMBOL_STR(up_write) }, - { 0xe6e3b875, __VMLINUX_SYMBOL_STR(down_write) }, - { 0xcd1850f2, __VMLINUX_SYMBOL_STR(fput) }, - { 0xf82cfd1a, __VMLINUX_SYMBOL_STR(proc_dostring) }, - { 0xc5ed6853, __VMLINUX_SYMBOL_STR(flush_signals) }, - { 0x581f98da, __VMLINUX_SYMBOL_STR(zlib_inflate) }, - { 0x16e297c3, __VMLINUX_SYMBOL_STR(bit_wait) }, - { 0x9f984513, __VMLINUX_SYMBOL_STR(strrchr) }, - { 0xd11b7a3e, __VMLINUX_SYMBOL_STR(kmem_cache_alloc) }, - { 0x78764f4e, __VMLINUX_SYMBOL_STR(pv_irq_ops) }, - { 0xb601be4c, __VMLINUX_SYMBOL_STR(__x86_indirect_thunk_rdx) }, - { 0x618911fc, __VMLINUX_SYMBOL_STR(numa_node) }, - { 0xc50bab05, __VMLINUX_SYMBOL_STR(unregister_shrinker) }, - { 0xa916b694, __VMLINUX_SYMBOL_STR(strnlen) }, - { 0xac3d20e2, __VMLINUX_SYMBOL_STR(unregister_sysctl_table) }, - { 0x93fca811, __VMLINUX_SYMBOL_STR(__get_free_pages) }, - { 0xe9f7149c, __VMLINUX_SYMBOL_STR(zlib_deflate_workspacesize) }, - { 0xf0fdf6cb, __VMLINUX_SYMBOL_STR(__stack_chk_fail) }, - { 0xc311ec22, __VMLINUX_SYMBOL_STR(cpu_possible_mask) }, - { 0x9cb986f2, __VMLINUX_SYMBOL_STR(vmalloc_base) }, - { 0xe200d2d5, __VMLINUX_SYMBOL_STR(param_get_uint) }, - { 0xd62c833f, __VMLINUX_SYMBOL_STR(schedule_timeout) }, - { 0x1000e51, __VMLINUX_SYMBOL_STR(schedule) }, - { 0x79a38e61, __VMLINUX_SYMBOL_STR(___ratelimit) }, - { 0x6b2dc060, __VMLINUX_SYMBOL_STR(dump_stack) }, - { 0x2ea2c95c, __VMLINUX_SYMBOL_STR(__x86_indirect_thunk_rax) }, - { 0xe65cdceb, __VMLINUX_SYMBOL_STR(wake_up_process) }, - { 0x9a5349f3, __VMLINUX_SYMBOL_STR(__put_cred) }, - { 0xf8489fcd, __VMLINUX_SYMBOL_STR(user_path_at) }, - { 0xbdfb6dbb, __VMLINUX_SYMBOL_STR(__fentry__) }, - { 0x91242962, __VMLINUX_SYMBOL_STR(path_put) }, - { 0x123f82f3, __VMLINUX_SYMBOL_STR(getrawmonotonic64) }, - { 0x41ec4c1a, __VMLINUX_SYMBOL_STR(kmem_cache_alloc_trace) }, - { 0xd94cc09, __VMLINUX_SYMBOL_STR(__per_cpu_offset) }, - { 0x9327f5ce, __VMLINUX_SYMBOL_STR(_raw_spin_lock_irqsave) }, - { 0xa5526619, __VMLINUX_SYMBOL_STR(rb_insert_color) }, - { 0xaf5517a9, __VMLINUX_SYMBOL_STR(kmem_cache_create) }, - { 0x35a88f28, __VMLINUX_SYMBOL_STR(zlib_inflateInit2) }, - { 0xf2c43f3f, __VMLINUX_SYMBOL_STR(zlib_deflate) }, - { 0x99195078, __VMLINUX_SYMBOL_STR(vsnprintf) }, - { 0x4302d0eb, __VMLINUX_SYMBOL_STR(free_pages) }, - { 0xcf21d241, __VMLINUX_SYMBOL_STR(__wake_up) }, - { 0xb3f7646e, __VMLINUX_SYMBOL_STR(kthread_should_stop) }, - { 0xe8a73aaf, __VMLINUX_SYMBOL_STR(out_of_line_wait_on_bit) }, - { 0x8c34c149, __VMLINUX_SYMBOL_STR(proc_create_data) }, - { 0x65bbbc78, __VMLINUX_SYMBOL_STR(schedule_hrtimeout_range) }, - { 0x1685c91c, __VMLINUX_SYMBOL_STR(seq_lseek) }, - { 0xa9bd2676, __VMLINUX_SYMBOL_STR(__vmalloc) }, - { 0x9c55cec, __VMLINUX_SYMBOL_STR(schedule_timeout_interruptible) }, - { 0x37a0cba, __VMLINUX_SYMBOL_STR(kfree) }, - { 0x69acdf38, __VMLINUX_SYMBOL_STR(memcpy) }, - { 0x5c8b5ce8, __VMLINUX_SYMBOL_STR(prepare_to_wait) }, - { 0x8bfe8c57, __VMLINUX_SYMBOL_STR(param_set_uint) }, - { 0x9518b623, __VMLINUX_SYMBOL_STR(register_shrinker) }, - { 0x889c0220, __VMLINUX_SYMBOL_STR(set_user_nice) }, - { 0xee46885d, __VMLINUX_SYMBOL_STR(add_wait_queue_exclusive) }, - { 0x9185525, __VMLINUX_SYMBOL_STR(fget) }, - { 0x7628f3c7, __VMLINUX_SYMBOL_STR(this_cpu_off) }, - { 0xc890c008, __VMLINUX_SYMBOL_STR(zlib_deflateEnd) }, - { 0xfa66f77c, __VMLINUX_SYMBOL_STR(finish_wait) }, - { 0x4cbbd171, __VMLINUX_SYMBOL_STR(__bitmap_weight) }, - { 0x55f5019b, __VMLINUX_SYMBOL_STR(__kmalloc_node) }, - { 0x28318305, __VMLINUX_SYMBOL_STR(snprintf) }, - { 0x4f897611, __VMLINUX_SYMBOL_STR(seq_release) }, - { 0xb0e602eb, __VMLINUX_SYMBOL_STR(memmove) }, - { 0xfbc4f89e, __VMLINUX_SYMBOL_STR(io_schedule_timeout) }, - { 0x5541ea93, __VMLINUX_SYMBOL_STR(on_each_cpu) }, - { 0xc26151de, __VMLINUX_SYMBOL_STR(vfs_getattr) }, - { 0x77e2f33, __VMLINUX_SYMBOL_STR(_copy_from_user) }, - { 0xe5d95985, __VMLINUX_SYMBOL_STR(param_ops_ulong) }, - { 0x6d044c26, __VMLINUX_SYMBOL_STR(param_ops_uint) }, - { 0x2a6e6109, __VMLINUX_SYMBOL_STR(__init_rwsem) }, - { 0xc9bf2a38, __VMLINUX_SYMBOL_STR(vfs_write) }, - { 0x9c7c731b, __VMLINUX_SYMBOL_STR(filp_open) }, -}; - -static const char __module_depends[] -__used -__attribute__((section(".modinfo"))) = -"depends="; - - -MODULE_INFO(srcversion, "2080768537B4B3B2FA210A5"); -MODULE_INFO(rhelversion, "7.4"); -#ifdef RETPOLINE - MODULE_INFO(retpoline, "Y"); -#endif diff --git a/module/splat/splat.mod.c b/module/splat/splat.mod.c deleted file mode 100644 index 6df5d72..0000000 --- a/module/splat/splat.mod.c +++ /dev/null @@ -1,180 +0,0 @@ -#include -#include -#include - -MODULE_INFO(vermagic, VERMAGIC_STRING); - -struct module __this_module -__attribute__((section(".gnu.linkonce.this_module"))) = { - .name = KBUILD_MODNAME, - .init = init_module, -#ifdef CONFIG_MODULE_UNLOAD - .exit = cleanup_module, -#endif - .arch = MODULE_ARCH_INIT, -}; - -static const struct modversion_info ____versions[] -__used -__attribute__((section("__versions"))) = { - { 0x28950ef1, __VMLINUX_SYMBOL_STR(module_layout) }, - { 0xb7b69dab, __VMLINUX_SYMBOL_STR(vn_fsync) }, - { 0x98ab5c8d, __VMLINUX_SYMBOL_STR(kmalloc_caches) }, - { 0x65e75cb6, __VMLINUX_SYMBOL_STR(__list_del_entry) }, - { 0xd2b09ce5, __VMLINUX_SYMBOL_STR(__kmalloc) }, - { 0xf9a482f9, __VMLINUX_SYMBOL_STR(msleep) }, - { 0xd8b5eb52, __VMLINUX_SYMBOL_STR(z_uncompress) }, - { 0xd670e116, __VMLINUX_SYMBOL_STR(spl_kmem_alloc_warn) }, - { 0xf5893abf, __VMLINUX_SYMBOL_STR(up_read) }, - { 0x4be94236, __VMLINUX_SYMBOL_STR(rwsem_tryupgrade) }, - { 0xe6da44a, __VMLINUX_SYMBOL_STR(set_normalized_timespec) }, - { 0xd6ee688f, __VMLINUX_SYMBOL_STR(vmalloc) }, - { 0x784213a6, __VMLINUX_SYMBOL_STR(pv_lock_ops) }, - { 0x4b7dcf38, __VMLINUX_SYMBOL_STR(_raw_qspin_lock) }, - { 0x754d539c, __VMLINUX_SYMBOL_STR(strlen) }, - { 0xbd6bcd08, __VMLINUX_SYMBOL_STR(crhold) }, - { 0x19302b91, __VMLINUX_SYMBOL_STR(vn_close) }, - { 0xcd44eb00, __VMLINUX_SYMBOL_STR(taskq_create) }, - { 0xce6d7d76, __VMLINUX_SYMBOL_STR(crgetruid) }, - { 0xc8b57c27, __VMLINUX_SYMBOL_STR(autoremove_wake_function) }, - { 0x8d7e0b91, __VMLINUX_SYMBOL_STR(vn_getattr) }, - { 0x930484aa, __VMLINUX_SYMBOL_STR(cpu_online_mask) }, - { 0x79aa04a2, __VMLINUX_SYMBOL_STR(get_random_bytes) }, - { 0xb342d16a, __VMLINUX_SYMBOL_STR(spl_kmem_alloc) }, - { 0xe7813a4, __VMLINUX_SYMBOL_STR(rootdir) }, - { 0x73a78bc4, __VMLINUX_SYMBOL_STR(downgrade_write) }, - { 0xa08322cc, __VMLINUX_SYMBOL_STR(taskq_init_ent) }, - { 0x16837e70, __VMLINUX_SYMBOL_STR(kobj_close_file) }, - { 0xc0a3d105, __VMLINUX_SYMBOL_STR(find_next_bit) }, - { 0x89291f9f, __VMLINUX_SYMBOL_STR(kobj_get_filesize) }, - { 0xbaeceadd, __VMLINUX_SYMBOL_STR(crgetngroups) }, - { 0xa1f9a134, __VMLINUX_SYMBOL_STR(__x86_indirect_thunk_rsi) }, - { 0x3098be9f, __VMLINUX_SYMBOL_STR(crgetgroups) }, - { 0xeef161aa, __VMLINUX_SYMBOL_STR(groups_free) }, - { 0x4ed12f73, __VMLINUX_SYMBOL_STR(mutex_unlock) }, - { 0xda0b5604, __VMLINUX_SYMBOL_STR(vn_rdwr) }, - { 0x999e8297, __VMLINUX_SYMBOL_STR(vfree) }, - { 0xea79001e, __VMLINUX_SYMBOL_STR(crgetsuid) }, - { 0x91715312, __VMLINUX_SYMBOL_STR(sprintf) }, - { 0x8eb0a41f, __VMLINUX_SYMBOL_STR(tsd_destroy) }, - { 0xe5779a08, __VMLINUX_SYMBOL_STR(spl_kmem_cache_free) }, - { 0x53c639a, __VMLINUX_SYMBOL_STR(ddi_strtoul) }, - { 0xbc32eee7, __VMLINUX_SYMBOL_STR(spl_panic) }, - { 0x7d11c268, __VMLINUX_SYMBOL_STR(jiffies) }, - { 0x343a1a8, __VMLINUX_SYMBOL_STR(__list_add) }, - { 0xe196a9f7, __VMLINUX_SYMBOL_STR(mutex_trylock) }, - { 0x57a6ccd0, __VMLINUX_SYMBOL_STR(down_read) }, - { 0x4e2dcaae, __VMLINUX_SYMBOL_STR(spl_kthread_create) }, - { 0x35225ea3, __VMLINUX_SYMBOL_STR(down_write_trylock) }, - { 0xde9360ba, __VMLINUX_SYMBOL_STR(totalram_pages) }, - { 0x72cf8c8b, __VMLINUX_SYMBOL_STR(crgetuid) }, - { 0x41972754, __VMLINUX_SYMBOL_STR(make_kgid) }, - { 0xf432dd3d, __VMLINUX_SYMBOL_STR(__init_waitqueue_head) }, - { 0x71de9b3f, __VMLINUX_SYMBOL_STR(_copy_to_user) }, - { 0xfe7c4287, __VMLINUX_SYMBOL_STR(nr_cpu_ids) }, - { 0x6b220bcb, __VMLINUX_SYMBOL_STR(taskq_destroy) }, - { 0xf23b2e74, __VMLINUX_SYMBOL_STR(misc_register) }, - { 0xfb578fc5, __VMLINUX_SYMBOL_STR(memset) }, - { 0xb51262a, __VMLINUX_SYMBOL_STR(spl_kmem_cache_destroy) }, - { 0x29eec2f0, __VMLINUX_SYMBOL_STR(vmem_size) }, - { 0x24bd0182, __VMLINUX_SYMBOL_STR(taskq_wait_id) }, - { 0xb8c7ff88, __VMLINUX_SYMBOL_STR(current_task) }, - { 0xadd3247e, __VMLINUX_SYMBOL_STR(__cv_signal) }, - { 0x9a025cd5, __VMLINUX_SYMBOL_STR(__mutex_init) }, - { 0x27e1a049, __VMLINUX_SYMBOL_STR(printk) }, - { 0x42f90a31, __VMLINUX_SYMBOL_STR(kthread_stop) }, - { 0x5d5704d7, __VMLINUX_SYMBOL_STR(crgetrgid) }, - { 0x449ad0a7, __VMLINUX_SYMBOL_STR(memcmp) }, - { 0xefcbb1b, __VMLINUX_SYMBOL_STR(set_current_groups) }, - { 0xe7b00dfb, __VMLINUX_SYMBOL_STR(__x86_indirect_thunk_r13) }, - { 0x2e2e322f, __VMLINUX_SYMBOL_STR(taskq_wait) }, - { 0x9166fada, __VMLINUX_SYMBOL_STR(strncpy) }, - { 0x5aaafd45, __VMLINUX_SYMBOL_STR(__cv_timedwait) }, - { 0x5a921311, __VMLINUX_SYMBOL_STR(strncmp) }, - { 0x9abdea30, __VMLINUX_SYMBOL_STR(mutex_lock) }, - { 0x5f08dbe, __VMLINUX_SYMBOL_STR(system_taskq) }, - { 0x589fea99, __VMLINUX_SYMBOL_STR(taskq_dispatch) }, - { 0x521445b, __VMLINUX_SYMBOL_STR(list_del) }, - { 0x6c2c274e, __VMLINUX_SYMBOL_STR(spl_vmem_zalloc) }, - { 0xc5fdef94, __VMLINUX_SYMBOL_STR(call_usermodehelper) }, - { 0x794379bf, __VMLINUX_SYMBOL_STR(crgetsgid) }, - { 0x3b4ceb4a, __VMLINUX_SYMBOL_STR(up_write) }, - { 0xe6e3b875, __VMLINUX_SYMBOL_STR(down_write) }, - { 0x1b27ac37, __VMLINUX_SYMBOL_STR(crgetgid) }, - { 0xb75ecbeb, __VMLINUX_SYMBOL_STR(__cv_broadcast) }, - { 0x3323ccb1, __VMLINUX_SYMBOL_STR(tsd_get) }, - { 0x5dbd6138, __VMLINUX_SYMBOL_STR(taskq_dispatch_ent) }, - { 0x9d271bf, __VMLINUX_SYMBOL_STR(spl_kmem_cache_expire) }, - { 0x6be0bc63, __VMLINUX_SYMBOL_STR(init_task) }, - { 0xfd07bd40, __VMLINUX_SYMBOL_STR(spl_kmem_alloc_max) }, - { 0x55de2e28, __VMLINUX_SYMBOL_STR(z_compress_level) }, - { 0xc50bab05, __VMLINUX_SYMBOL_STR(unregister_shrinker) }, - { 0x3e43bb06, __VMLINUX_SYMBOL_STR(__cv_wait) }, - { 0xf76b5740, __VMLINUX_SYMBOL_STR(crfree) }, - { 0x93fca811, __VMLINUX_SYMBOL_STR(__get_free_pages) }, - { 0xf0fdf6cb, __VMLINUX_SYMBOL_STR(__stack_chk_fail) }, - { 0xd62c833f, __VMLINUX_SYMBOL_STR(schedule_timeout) }, - { 0x1000e51, __VMLINUX_SYMBOL_STR(schedule) }, - { 0xa202a8e5, __VMLINUX_SYMBOL_STR(kmalloc_order_trace) }, - { 0x958b84e3, __VMLINUX_SYMBOL_STR(tsd_create) }, - { 0xf0202554, __VMLINUX_SYMBOL_STR(spl_kmem_cache_create) }, - { 0x68c4f9da, __VMLINUX_SYMBOL_STR(taskq_wait_outstanding) }, - { 0xa2724b1e, __VMLINUX_SYMBOL_STR(kobj_read_file) }, - { 0x2ea2c95c, __VMLINUX_SYMBOL_STR(__x86_indirect_thunk_rax) }, - { 0x211f68f1, __VMLINUX_SYMBOL_STR(getnstimeofday64) }, - { 0xfe172afe, __VMLINUX_SYMBOL_STR(spl_vmem_alloc) }, - { 0xe65cdceb, __VMLINUX_SYMBOL_STR(wake_up_process) }, - { 0xd1aa34d4, __VMLINUX_SYMBOL_STR(spl_kmem_cache_alloc) }, - { 0xbdfb6dbb, __VMLINUX_SYMBOL_STR(__fentry__) }, - { 0xa3a77c69, __VMLINUX_SYMBOL_STR(down_read_trylock) }, - { 0x123f82f3, __VMLINUX_SYMBOL_STR(getrawmonotonic64) }, - { 0x41ec4c1a, __VMLINUX_SYMBOL_STR(kmem_cache_alloc_trace) }, - { 0xf1e4497, __VMLINUX_SYMBOL_STR(__cv_init) }, - { 0x4302d0eb, __VMLINUX_SYMBOL_STR(free_pages) }, - { 0xcf21d241, __VMLINUX_SYMBOL_STR(__wake_up) }, - { 0xb3f7646e, __VMLINUX_SYMBOL_STR(kthread_should_stop) }, - { 0x6cd72a01, __VMLINUX_SYMBOL_STR(vn_open) }, - { 0x36bd681b, __VMLINUX_SYMBOL_STR(groups_alloc) }, - { 0x1285cb78, __VMLINUX_SYMBOL_STR(tsd_set) }, - { 0x3896a905, __VMLINUX_SYMBOL_STR(__thread_exit) }, - { 0x37a0cba, __VMLINUX_SYMBOL_STR(kfree) }, - { 0x82fe53e1, __VMLINUX_SYMBOL_STR(ddi_strtol) }, - { 0x69acdf38, __VMLINUX_SYMBOL_STR(memcpy) }, - { 0x5c8b5ce8, __VMLINUX_SYMBOL_STR(prepare_to_wait) }, - { 0x9518b623, __VMLINUX_SYMBOL_STR(register_shrinker) }, - { 0xf68905fd, __VMLINUX_SYMBOL_STR(ddi_strtoull) }, - { 0xd9ace09, __VMLINUX_SYMBOL_STR(ddi_strtoll) }, - { 0xfa66f77c, __VMLINUX_SYMBOL_STR(finish_wait) }, - { 0x4cbbd171, __VMLINUX_SYMBOL_STR(__bitmap_weight) }, - { 0x2109bc3a, __VMLINUX_SYMBOL_STR(random_get_pseudo_bytes) }, - { 0xa88e7496, __VMLINUX_SYMBOL_STR(kobj_open_file) }, - { 0x8a51e16a, __VMLINUX_SYMBOL_STR(groupmember) }, - { 0x401c592f, __VMLINUX_SYMBOL_STR(spl_version) }, - { 0x28318305, __VMLINUX_SYMBOL_STR(snprintf) }, - { 0x6d16801a, __VMLINUX_SYMBOL_STR(spl_kmem_free) }, - { 0x83aa5282, __VMLINUX_SYMBOL_STR(spl_kmem_cache_reap_now) }, - { 0x47805038, __VMLINUX_SYMBOL_STR(__thread_create) }, - { 0x77e2f33, __VMLINUX_SYMBOL_STR(_copy_from_user) }, - { 0xff749bc, __VMLINUX_SYMBOL_STR(spl_vmem_free) }, - { 0xd92839b8, __VMLINUX_SYMBOL_STR(taskq_cancel_id) }, - { 0xa1012e43, __VMLINUX_SYMBOL_STR(misc_deregister) }, - { 0x2a6e6109, __VMLINUX_SYMBOL_STR(__init_rwsem) }, - { 0xdb77dd01, __VMLINUX_SYMBOL_STR(taskq_dispatch_delay) }, - { 0xbccac85e, __VMLINUX_SYMBOL_STR(p0) }, - { 0x459a3b05, __VMLINUX_SYMBOL_STR(__cv_destroy) }, - { 0x584f0fa4, __VMLINUX_SYMBOL_STR(vn_openat) }, - { 0x9b0325e8, __VMLINUX_SYMBOL_STR(spl_kmem_zalloc) }, - { 0xa2b0e8ef, __VMLINUX_SYMBOL_STR(taskq_empty_ent) }, -}; - -static const char __module_depends[] -__used -__attribute__((section(".modinfo"))) = -"depends=spl"; - - -MODULE_INFO(srcversion, "FA48BA642E4DB597F2B22E9"); -MODULE_INFO(rhelversion, "7.4"); -#ifdef RETPOLINE - MODULE_INFO(retpoline, "Y"); -#endif diff --git a/rpm/generic/spl-dkms.spec.in b/rpm/generic/spl-dkms.spec.in index 4196240..a8691d2 100644 --- a/rpm/generic/spl-dkms.spec.in +++ b/rpm/generic/spl-dkms.spec.in @@ -7,6 +7,16 @@ %define module @PACKAGE@ %define mkconf scripts/dkms.mkconf +# Python permits the !/usr/bin/python shebang for scripts that are cross +# compatible between python2 and python3, but Fedora 28 does not. Fedora +# wants us to choose python3 for cross-compatible scripts. Since we want +# to support python2 and python3 users, exclude our scripts from Fedora 28's +# RPM build check, so that we don't get a bunch of build warnings. +# +# Details: https://github.com/zfsonlinux/zfs/issues/7360 +# +%global __brp_mangle_shebangs_exclude_from splslab.py + Name: %{module}-dkms Version: @VERSION@ diff --git a/rpm/generic/spl-kmod.spec.in b/rpm/generic/spl-kmod.spec.in index a604e1f..9cd2225 100644 --- a/rpm/generic/spl-kmod.spec.in +++ b/rpm/generic/spl-kmod.spec.in @@ -167,6 +167,9 @@ chmod u+x ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/*/extra/*/*/* rm -rf $RPM_BUILD_ROOT %changelog +* Tue May 08 2018 Tony Hutter - 0.7.9-1 +- Released 0.7.9-1, detailed release notes are available at: +- https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.9 * Mon Apr 09 2018 Tony Hutter - 0.7.8-1 - Released 0.7.8-1, detailed release notes are available at: - https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.8 diff --git a/rpm/generic/spl.spec.in b/rpm/generic/spl.spec.in index e7a718a..39c6411 100644 --- a/rpm/generic/spl.spec.in +++ b/rpm/generic/spl.spec.in @@ -1,3 +1,13 @@ +# Python permits the !/usr/bin/python shebang for scripts that are cross +# compatible between python2 and python3, but Fedora 28 does not. Fedora +# wants us to choose python3 for cross-compatible scripts. Since we want +# to support python2 and python3 users, exclude our scripts from Fedora 28's +# RPM build check, so that we don't get a bunch of build warnings. +# +# Details: https://github.com/zfsonlinux/zfs/issues/7360 +# +%global __brp_mangle_shebangs_exclude_from splslab.py + Name: @PACKAGE@ Version: @VERSION@ Release: @RELEASE@%{?dist} @@ -34,6 +44,9 @@ make install DESTDIR=%{?buildroot} %{_mandir}/man5/* %changelog +* Tue May 08 2018 Tony Hutter - 0.7.9-1 +- Released 0.7.9-1, detailed release notes are available at: +- https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.9 * Mon Apr 09 2018 Tony Hutter - 0.7.8-1 - Released 0.7.8-1, detailed release notes are available at: - https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.8 diff --git a/rpm/redhat/spl-dkms.spec.in b/rpm/redhat/spl-dkms.spec.in index 4196240..a8691d2 100644 --- a/rpm/redhat/spl-dkms.spec.in +++ b/rpm/redhat/spl-dkms.spec.in @@ -7,6 +7,16 @@ %define module @PACKAGE@ %define mkconf scripts/dkms.mkconf +# Python permits the !/usr/bin/python shebang for scripts that are cross +# compatible between python2 and python3, but Fedora 28 does not. Fedora +# wants us to choose python3 for cross-compatible scripts. Since we want +# to support python2 and python3 users, exclude our scripts from Fedora 28's +# RPM build check, so that we don't get a bunch of build warnings. +# +# Details: https://github.com/zfsonlinux/zfs/issues/7360 +# +%global __brp_mangle_shebangs_exclude_from splslab.py + Name: %{module}-dkms Version: @VERSION@ diff --git a/rpm/redhat/spl.spec.in b/rpm/redhat/spl.spec.in index e7a718a..39c6411 100644 --- a/rpm/redhat/spl.spec.in +++ b/rpm/redhat/spl.spec.in @@ -1,3 +1,13 @@ +# Python permits the !/usr/bin/python shebang for scripts that are cross +# compatible between python2 and python3, but Fedora 28 does not. Fedora +# wants us to choose python3 for cross-compatible scripts. Since we want +# to support python2 and python3 users, exclude our scripts from Fedora 28's +# RPM build check, so that we don't get a bunch of build warnings. +# +# Details: https://github.com/zfsonlinux/zfs/issues/7360 +# +%global __brp_mangle_shebangs_exclude_from splslab.py + Name: @PACKAGE@ Version: @VERSION@ Release: @RELEASE@%{?dist} @@ -34,6 +44,9 @@ make install DESTDIR=%{?buildroot} %{_mandir}/man5/* %changelog +* Tue May 08 2018 Tony Hutter - 0.7.9-1 +- Released 0.7.9-1, detailed release notes are available at: +- https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.9 * Mon Apr 09 2018 Tony Hutter - 0.7.8-1 - Released 0.7.8-1, detailed release notes are available at: - https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.8