diff -Nru spl-linux-0.7.12/aclocal.m4 spl-linux-0.7.13/aclocal.m4 --- spl-linux-0.7.12/aclocal.m4 2018-11-09 01:09:40.000000000 +0000 +++ spl-linux-0.7.13/aclocal.m4 2019-02-22 17:59:30.000000000 +0000 @@ -1017,11 +1017,13 @@ ]) # _AM_PROG_TAR m4_include([config/kernel-ctl-table-name.m4]) +m4_include([config/kernel-current_kernel_time.m4]) m4_include([config/kernel-fallocate.m4]) m4_include([config/kernel-group-info.m4]) m4_include([config/kernel-inode-lock.m4]) m4_include([config/kernel-inode-times.m4]) m4_include([config/kernel-kmem-cache.m4]) +m4_include([config/kernel-ktime_get_coarse_real_ts64.m4]) m4_include([config/kernel-kuidgid.m4]) m4_include([config/kernel-pde-data.m4]) m4_include([config/kernel-rw.m4]) @@ -1031,6 +1033,8 @@ m4_include([config/kernel-shrinker.m4]) m4_include([config/kernel-spinlock.m4]) m4_include([config/kernel-timer.m4]) +m4_include([config/kernel-timespec_sub.m4]) +m4_include([config/kernel-totalram-pages-func.m4]) m4_include([config/kernel-trim-unused-symbols.m4]) m4_include([config/kernel-truncate-range.m4]) m4_include([config/kernel-urange-sleep.m4]) diff -Nru spl-linux-0.7.12/cmd/Makefile.in spl-linux-0.7.13/cmd/Makefile.in --- spl-linux-0.7.12/cmd/Makefile.in 2018-11-09 01:09:45.000000000 +0000 +++ spl-linux-0.7.13/cmd/Makefile.in 2019-02-22 17:59:35.000000000 +0000 @@ -38,11 +38,13 @@ DIST_COMMON = $(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-current_kernel_time.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-inode-times.m4 \ $(top_srcdir)/config/kernel-kmem-cache.m4 \ + $(top_srcdir)/config/kernel-ktime_get_coarse_real_ts64.m4 \ $(top_srcdir)/config/kernel-kuidgid.m4 \ $(top_srcdir)/config/kernel-pde-data.m4 \ $(top_srcdir)/config/kernel-rw.m4 \ @@ -52,6 +54,8 @@ $(top_srcdir)/config/kernel-shrinker.m4 \ $(top_srcdir)/config/kernel-spinlock.m4 \ $(top_srcdir)/config/kernel-timer.m4 \ + $(top_srcdir)/config/kernel-timespec_sub.m4 \ + $(top_srcdir)/config/kernel-totalram-pages-func.m4 \ $(top_srcdir)/config/kernel-trim-unused-symbols.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-urange-sleep.m4 \ diff -Nru spl-linux-0.7.12/cmd/splat/Makefile.in spl-linux-0.7.13/cmd/splat/Makefile.in --- spl-linux-0.7.12/cmd/splat/Makefile.in 2018-11-09 01:09:45.000000000 +0000 +++ spl-linux-0.7.13/cmd/splat/Makefile.in 2019-02-22 17:59:35.000000000 +0000 @@ -49,11 +49,13 @@ subdir = cmd/splat ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/kernel-ctl-table-name.m4 \ + $(top_srcdir)/config/kernel-current_kernel_time.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-inode-times.m4 \ $(top_srcdir)/config/kernel-kmem-cache.m4 \ + $(top_srcdir)/config/kernel-ktime_get_coarse_real_ts64.m4 \ $(top_srcdir)/config/kernel-kuidgid.m4 \ $(top_srcdir)/config/kernel-pde-data.m4 \ $(top_srcdir)/config/kernel-rw.m4 \ @@ -63,6 +65,8 @@ $(top_srcdir)/config/kernel-shrinker.m4 \ $(top_srcdir)/config/kernel-spinlock.m4 \ $(top_srcdir)/config/kernel-timer.m4 \ + $(top_srcdir)/config/kernel-timespec_sub.m4 \ + $(top_srcdir)/config/kernel-totalram-pages-func.m4 \ $(top_srcdir)/config/kernel-trim-unused-symbols.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-urange-sleep.m4 \ diff -Nru spl-linux-0.7.12/cmd/splslab/Makefile.in spl-linux-0.7.13/cmd/splslab/Makefile.in --- spl-linux-0.7.12/cmd/splslab/Makefile.in 2018-11-09 01:09:45.000000000 +0000 +++ spl-linux-0.7.13/cmd/splslab/Makefile.in 2019-02-22 17:59:35.000000000 +0000 @@ -39,11 +39,13 @@ DIST_COMMON = $(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-current_kernel_time.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-inode-times.m4 \ $(top_srcdir)/config/kernel-kmem-cache.m4 \ + $(top_srcdir)/config/kernel-ktime_get_coarse_real_ts64.m4 \ $(top_srcdir)/config/kernel-kuidgid.m4 \ $(top_srcdir)/config/kernel-pde-data.m4 \ $(top_srcdir)/config/kernel-rw.m4 \ @@ -53,6 +55,8 @@ $(top_srcdir)/config/kernel-shrinker.m4 \ $(top_srcdir)/config/kernel-spinlock.m4 \ $(top_srcdir)/config/kernel-timer.m4 \ + $(top_srcdir)/config/kernel-timespec_sub.m4 \ + $(top_srcdir)/config/kernel-totalram-pages-func.m4 \ $(top_srcdir)/config/kernel-trim-unused-symbols.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-urange-sleep.m4 \ diff -Nru spl-linux-0.7.12/config/kernel-current_kernel_time.m4 spl-linux-0.7.13/config/kernel-current_kernel_time.m4 --- spl-linux-0.7.12/config/kernel-current_kernel_time.m4 1970-01-01 00:00:00.000000000 +0000 +++ spl-linux-0.7.13/config/kernel-current_kernel_time.m4 2019-02-22 17:55:49.000000000 +0000 @@ -0,0 +1,16 @@ +dnl # +dnl # 4.20: Kernel removes current_kernel_time() +dnl # +AC_DEFUN([SPL_AC_KERNEL_CURRENT_KERNEL_TIME], + [AC_MSG_CHECKING([whether current_kernel_time() exists]) + SPL_LINUX_TRY_COMPILE([ + #include + ], [ + struct timespec t __attribute__ ((unused)) = current_kernel_time(); + ], [ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_KERNEL_CURRENT_TIME, 1, [current_kernel_time() exists]) + ], [ + AC_MSG_RESULT(no) + ]) +]) diff -Nru spl-linux-0.7.12/config/kernel-ktime_get_coarse_real_ts64.m4 spl-linux-0.7.13/config/kernel-ktime_get_coarse_real_ts64.m4 --- spl-linux-0.7.12/config/kernel-ktime_get_coarse_real_ts64.m4 1970-01-01 00:00:00.000000000 +0000 +++ spl-linux-0.7.13/config/kernel-ktime_get_coarse_real_ts64.m4 2019-02-22 17:55:49.000000000 +0000 @@ -0,0 +1,18 @@ +dnl # +dnl # 4.18: ktime_get_coarse_real_ts64() added. Use it in place of +dnl # current_kernel_time64(). +dnl # +AC_DEFUN([SPL_AC_KERNEL_KTIME_GET_COARSE_REAL_TS64], + [AC_MSG_CHECKING([whether ktime_get_coarse_real_ts64() exists]) + SPL_LINUX_TRY_COMPILE([ + #include + ], [ + struct timespec64 ts; + ktime_get_coarse_real_ts64(&ts); + ], [ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_KTIME_GET_COARSE_REAL_TS64, 1, [ktime_get_coarse_real_ts64() exists]) + ], [ + AC_MSG_RESULT(no) + ]) +]) diff -Nru spl-linux-0.7.12/config/kernel-timespec_sub.m4 spl-linux-0.7.13/config/kernel-timespec_sub.m4 --- spl-linux-0.7.12/config/kernel-timespec_sub.m4 1970-01-01 00:00:00.000000000 +0000 +++ spl-linux-0.7.13/config/kernel-timespec_sub.m4 2019-02-22 17:55:49.000000000 +0000 @@ -0,0 +1,20 @@ +dnl # +dnl # 5.0 API change +dnl # +dnl # Does timespec_sub() exists? If not, use timespec64_sub(). +dnl # +AC_DEFUN([SPL_AC_KERNEL_TIMESPEC_SUB], [ + AC_MSG_CHECKING([whether timespec_sub() exists]) + SPL_LINUX_TRY_COMPILE([ + #include + ],[ + struct timespec a = {0}, b = {0}; + timespec_sub(a, b); + ],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_KERNEL_TIMESPEC_SUB, 1, + [kernel has timespec_sub]) + ],[ + AC_MSG_RESULT(no) + ]) +]) diff -Nru spl-linux-0.7.12/config/kernel-totalram-pages-func.m4 spl-linux-0.7.13/config/kernel-totalram-pages-func.m4 --- spl-linux-0.7.12/config/kernel-totalram-pages-func.m4 1970-01-01 00:00:00.000000000 +0000 +++ spl-linux-0.7.13/config/kernel-totalram-pages-func.m4 2019-02-22 17:55:49.000000000 +0000 @@ -0,0 +1,18 @@ +dnl # +dnl # Linux 5.0: totalram_pages is no longer a global variable, and must be +dnl # read via the totalram_pages() helper function. +dnl # +AC_DEFUN([SPL_AC_KERNEL_TOTALRAM_PAGES_FUNC], [ + AC_MSG_CHECKING([whether totalram_pages() exists]) + SPL_LINUX_TRY_COMPILE([ + #include + ],[ + unsigned long pages __attribute__ ((unused)); + pages = totalram_pages(); + ],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_TOTALRAM_PAGES_FUNC, 1, [kernel has totalram_pages()]) + ],[ + AC_MSG_RESULT(no) + ]) +]) diff -Nru spl-linux-0.7.12/config/spl-build.m4 spl-linux-0.7.13/config/spl-build.m4 --- spl-linux-0.7.12/config/spl-build.m4 2018-11-08 22:40:46.000000000 +0000 +++ spl-linux-0.7.13/config/spl-build.m4 2019-02-22 17:55:49.000000000 +0000 @@ -54,6 +54,10 @@ SPL_AC_KERNEL_WRITE SPL_AC_KERNEL_READ SPL_AC_KERNEL_TIMER_FUNCTION_TIMER_LIST + SPL_AC_KERNEL_KTIME_GET_COARSE_REAL_TS64 + SPL_AC_KERNEL_TOTALRAM_PAGES_FUNC + SPL_AC_KERNEL_TIMESPEC_SUB + SPL_AC_KERNEL_CURRENT_KERNEL_TIME ]) AC_DEFUN([SPL_AC_MODULE_SYMVERS], [ @@ -156,7 +160,7 @@ if test "$utsrelease"; then kernsrcver=`(echo "#include <$utsrelease>"; echo "kernsrcver=UTS_RELEASE") | - cpp -I $kernelbuild/include | + ${CPP} -I $kernelbuild/include - | grep "^kernsrcver=" | cut -d \" -f 2` if test -z "$kernsrcver"; then diff -Nru spl-linux-0.7.12/configure spl-linux-0.7.13/configure --- spl-linux-0.7.12/configure 2018-11-09 01:09:42.000000000 +0000 +++ spl-linux-0.7.13/configure 2019-02-22 17:59:32.000000000 +0000 @@ -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.12. +# Generated by GNU Autoconf 2.63 for spl 0.7.13. # # 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 @@ # Identity of this package. PACKAGE_NAME='spl' PACKAGE_TARNAME='spl' -PACKAGE_VERSION='0.7.12' -PACKAGE_STRING='spl 0.7.12' +PACKAGE_VERSION='0.7.13' +PACKAGE_STRING='spl 0.7.13' PACKAGE_BUGREPORT='' # Factoring default headers for most tests. @@ -1535,7 +1535,7 @@ # 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.12 to adapt to many kinds of systems. +\`configure' configures spl 0.7.13 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1606,7 +1606,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of spl 0.7.12:";; + short | recursive ) echo "Configuration of spl 0.7.13:";; esac cat <<\_ACEOF @@ -1720,7 +1720,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -spl configure 0.7.12 +spl configure 0.7.13 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1734,7 +1734,7 @@ 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.12, which was +It was created by spl $as_me 0.7.13, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2888,7 +2888,7 @@ # Define the identity of the package. PACKAGE='spl' - VERSION='0.7.12' + VERSION='0.7.13' cat >>confdefs.h <<_ACEOF @@ -11795,7 +11795,7 @@ if test "$utsrelease"; then kernsrcver=`(echo "#include <$utsrelease>"; echo "kernsrcver=UTS_RELEASE") | - cpp -I $kernelbuild/include | + ${CPP} -I $kernelbuild/include - | grep "^kernsrcver=" | cut -d \" -f 2` if test -z "$kernsrcver"; then @@ -15252,6 +15252,275 @@ EXTRA_KCFLAGS="$tmp_flags" + { $as_echo "$as_me:$LINENO: checking whether ktime_get_coarse_real_ts64() exists" >&5 +$as_echo_n "checking whether ktime_get_coarse_real_ts64() exists... " >&6; } + + +cat confdefs.h - <<_ACEOF >conftest.c +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + + #include + +int +main (void) +{ + + struct timespec64 ts; + ktime_get_coarse_real_ts64(&ts); + + ; + return 0; +} + +_ACEOF + + + rm -Rf build && mkdir -p build && touch build/conftest.mod.c + echo "obj-m := conftest.o" >build/Makefile + modpost_flag='' + test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage + if { ac_try='cp conftest.c build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_KTIME_GET_COARSE_REAL_TS64 1 +_ACEOF + + +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + + + +fi + + rm -Rf build + + + + + { $as_echo "$as_me:$LINENO: checking whether totalram_pages() exists" >&5 +$as_echo_n "checking whether totalram_pages() exists... " >&6; } + + +cat confdefs.h - <<_ACEOF >conftest.c +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + + #include + +int +main (void) +{ + + unsigned long pages __attribute__ ((unused)); + pages = totalram_pages(); + + ; + return 0; +} + +_ACEOF + + + rm -Rf build && mkdir -p build && touch build/conftest.mod.c + echo "obj-m := conftest.o" >build/Makefile + modpost_flag='' + test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage + if { ac_try='cp conftest.c build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_TOTALRAM_PAGES_FUNC 1 +_ACEOF + + +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + + + +fi + + rm -Rf build + + + + + { $as_echo "$as_me:$LINENO: checking whether timespec_sub() exists" >&5 +$as_echo_n "checking whether timespec_sub() exists... " >&6; } + + +cat confdefs.h - <<_ACEOF >conftest.c +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + + #include + +int +main (void) +{ + + struct timespec a = {0}, b = {0}; + timespec_sub(a, b); + + ; + return 0; +} + +_ACEOF + + + rm -Rf build && mkdir -p build && touch build/conftest.mod.c + echo "obj-m := conftest.o" >build/Makefile + modpost_flag='' + test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage + if { ac_try='cp conftest.c build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_KERNEL_TIMESPEC_SUB 1 +_ACEOF + + +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + + + +fi + + rm -Rf build + + + + { $as_echo "$as_me:$LINENO: checking whether current_kernel_time() exists" >&5 +$as_echo_n "checking whether current_kernel_time() exists... " >&6; } + + +cat confdefs.h - <<_ACEOF >conftest.c +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + + #include + +int +main (void) +{ + + struct timespec t __attribute__ ((unused)) = current_kernel_time(); + + ; + return 0; +} + +_ACEOF + + + rm -Rf build && mkdir -p build && touch build/conftest.mod.c + echo "obj-m := conftest.o" >build/Makefile + modpost_flag='' + test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage + if { ac_try='cp conftest.c build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_KERNEL_CURRENT_TIME 1 +_ACEOF + + +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + + + +fi + + rm -Rf build + + + ;; user) ;; all) @@ -15345,7 +15614,7 @@ if test "$utsrelease"; then kernsrcver=`(echo "#include <$utsrelease>"; echo "kernsrcver=UTS_RELEASE") | - cpp -I $kernelbuild/include | + ${CPP} -I $kernelbuild/include - | grep "^kernsrcver=" | cut -d \" -f 2` if test -z "$kernsrcver"; then @@ -18802,6 +19071,275 @@ EXTRA_KCFLAGS="$tmp_flags" + { $as_echo "$as_me:$LINENO: checking whether ktime_get_coarse_real_ts64() exists" >&5 +$as_echo_n "checking whether ktime_get_coarse_real_ts64() exists... " >&6; } + + +cat confdefs.h - <<_ACEOF >conftest.c +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + + #include + +int +main (void) +{ + + struct timespec64 ts; + ktime_get_coarse_real_ts64(&ts); + + ; + return 0; +} + +_ACEOF + + + rm -Rf build && mkdir -p build && touch build/conftest.mod.c + echo "obj-m := conftest.o" >build/Makefile + modpost_flag='' + test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage + if { ac_try='cp conftest.c build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_KTIME_GET_COARSE_REAL_TS64 1 +_ACEOF + + +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + + + +fi + + rm -Rf build + + + + + { $as_echo "$as_me:$LINENO: checking whether totalram_pages() exists" >&5 +$as_echo_n "checking whether totalram_pages() exists... " >&6; } + + +cat confdefs.h - <<_ACEOF >conftest.c +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + + #include + +int +main (void) +{ + + unsigned long pages __attribute__ ((unused)); + pages = totalram_pages(); + + ; + return 0; +} + +_ACEOF + + + rm -Rf build && mkdir -p build && touch build/conftest.mod.c + echo "obj-m := conftest.o" >build/Makefile + modpost_flag='' + test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage + if { ac_try='cp conftest.c build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_TOTALRAM_PAGES_FUNC 1 +_ACEOF + + +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + + + +fi + + rm -Rf build + + + + + { $as_echo "$as_me:$LINENO: checking whether timespec_sub() exists" >&5 +$as_echo_n "checking whether timespec_sub() exists... " >&6; } + + +cat confdefs.h - <<_ACEOF >conftest.c +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + + #include + +int +main (void) +{ + + struct timespec a = {0}, b = {0}; + timespec_sub(a, b); + + ; + return 0; +} + +_ACEOF + + + rm -Rf build && mkdir -p build && touch build/conftest.mod.c + echo "obj-m := conftest.o" >build/Makefile + modpost_flag='' + test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage + if { ac_try='cp conftest.c build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_KERNEL_TIMESPEC_SUB 1 +_ACEOF + + +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + + + +fi + + rm -Rf build + + + + { $as_echo "$as_me:$LINENO: checking whether current_kernel_time() exists" >&5 +$as_echo_n "checking whether current_kernel_time() exists... " >&6; } + + +cat confdefs.h - <<_ACEOF >conftest.c +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + + #include + +int +main (void) +{ + + struct timespec t __attribute__ ((unused)) = current_kernel_time(); + + ; + return 0; +} + +_ACEOF + + + rm -Rf build && mkdir -p build && touch build/conftest.mod.c + echo "obj-m := conftest.o" >build/Makefile + modpost_flag='' + test "x$enable_linux_builtin" = xyes && modpost_flag='modpost=true' # fake modpost stage + if { ac_try='cp conftest.c build && make modules -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build $modpost_flag' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } >/dev/null && { ac_try='test -s build/conftest.o' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + +cat >>confdefs.h <<\_ACEOF +#define HAVE_KERNEL_CURRENT_TIME 1 +_ACEOF + + +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + + + +fi + + rm -Rf build + + + ;; srpm) ;; @@ -19394,7 +19932,7 @@ # 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.12, which was +This file was extended by spl $as_me 0.7.13, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -19457,7 +19995,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -spl config.status 0.7.12 +spl config.status 0.7.13 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -Nru spl-linux-0.7.12/debian/changelog spl-linux-0.7.13/debian/changelog --- spl-linux-0.7.12/debian/changelog 2019-01-23 14:12:59.000000000 +0000 +++ spl-linux-0.7.13/debian/changelog 2019-03-19 13:45:53.000000000 +0000 @@ -1,25 +1,34 @@ -spl-linux (0.7.12-1ubuntu2~14.04.york0) trusty; urgency=medium +spl-linux (0.7.13-1~14.04.york0) trusty; urgency=medium * debian/control.in: lower DKMS D to match BD - -- Jonathon Fernyhough Wed, 23 Jan 2019 14:12:59 +0000 + -- Jonathon Fernyhough Tue, 19 Mar 2019 13:45:53 +0000 -spl-linux (0.7.12-1ubuntu2) disco; urgency=medium +spl-linux (0.7.13-1) unstable; urgency=medium - * Various Linux compat 5.0 changes - - check for ktime_get_coarse_real_ts64 - - check for ktime_get_ts64 - - check for timespec64 - - check for totalram-pages now being a function - - and use the above fixes in spl - - -- Colin Ian King Fri, 18 Jan 2019 14:53:11 +0000 + * New upstream version 0.7.13 + * Remove patches for linux 5.0 compat. (supported by upstream) + * Bump Standards-Version to 4.3.0 (no change). -spl-linux (0.7.12-1ubuntu1) disco; urgency=medium + -- Mo Zhou Tue, 05 Mar 2019 07:06:40 +0000 - * Sync with Debian 0.7.12-1 +spl-linux (0.7.12-2) unstable; urgency=medium - -- Colin Ian King Wed, 21 Nov 2018 10:54:15 +0000 + [ Colin Ian King ] + * Add Linux 5.0 compat fixes. + + 0001-Add-check-for-ktime_get_coarse_real_ts64-for-V5.0-ke.patch + + 0002-Add-check-for-totalram-pages.patch + + 0003-Add-check-for-ktime_get_ts64-for-V5.0-ke.patch + + 0004-Add-check-for-timespec64-sub.patch + + 0005-Use-64-bit-timespec-fixes.patch + * Fix autopkgtest depends, we really need to include @ too + * Just run the splat tests for now as these are the critical interface + tests and the will fail if spl modules are broken. + + [ Mo Zhou ] + * Bump linux_compat to 5.0 + + -- Mo Zhou Tue, 19 Feb 2019 04:40:38 +0000 spl-linux (0.7.12-1) unstable; urgency=medium diff -Nru spl-linux-0.7.12/debian/control spl-linux-0.7.13/debian/control --- spl-linux-0.7.12/debian/control 2019-01-23 14:12:59.000000000 +0000 +++ spl-linux-0.7.13/debian/control 2019-03-19 13:45:53.000000000 +0000 @@ -1,8 +1,7 @@ Source: spl-linux Section: kernel Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian ZFS on Linux maintainers +Maintainer: Debian ZFS on Linux maintainers Uploaders: Aron Xu , Carlos Alberto Lopez Perez , Mo Zhou , @@ -12,21 +11,21 @@ dh-autoreconf, dkms (>> 2.2.0.2-1~), libtool -Standards-Version: 4.1.2 +Standards-Version: 4.3.0 Homepage: http://www.zfsonlinux.org/ Vcs-Git: https://salsa.debian.org/zfsonlinux-team/spl.git Vcs-Browser: https://salsa.debian.org/zfsonlinux-team/spl Package: spl-dkms Architecture: all -Depends: dkms (>> 2.2.0.2), +Depends: dkms (>> 2.2.0.2-1~), file, libc-dev, libelf-dev, lsb-release, ${misc:Depends} Suggests: spl (>= ${source:Upstream-Version}), - linux-libc-dev (<< 4.20~) + linux-libc-dev (<< 5.1~) Conflicts: spl (<< 0.7.9~) Provides: spl-modules Description: Solaris Porting Layer kernel modules for Linux diff -Nru spl-linux-0.7.12/debian/control.in spl-linux-0.7.13/debian/control.in --- spl-linux-0.7.12/debian/control.in 2019-01-23 14:12:59.000000000 +0000 +++ spl-linux-0.7.13/debian/control.in 2019-03-19 13:45:53.000000000 +0000 @@ -1,8 +1,7 @@ Source: spl-linux Section: kernel Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian ZFS on Linux maintainers +Maintainer: Debian ZFS on Linux maintainers Uploaders: Aron Xu , Carlos Alberto Lopez Perez , Mo Zhou , @@ -12,14 +11,14 @@ dh-autoreconf, dkms (>> 2.2.0.2-1~), libtool -Standards-Version: 4.1.2 +Standards-Version: 4.3.0 Homepage: http://www.zfsonlinux.org/ Vcs-Git: https://salsa.debian.org/zfsonlinux-team/spl.git Vcs-Browser: https://salsa.debian.org/zfsonlinux-team/spl Package: spl-dkms Architecture: all -Depends: dkms (>> 2.2.0.2), +Depends: dkms (>> 2.2.0.2-1~), file, libc-dev, libelf-dev, diff -Nru spl-linux-0.7.12/debian/linux_compat spl-linux-0.7.13/debian/linux_compat --- spl-linux-0.7.12/debian/linux_compat 2018-11-19 11:25:53.000000000 +0000 +++ spl-linux-0.7.13/debian/linux_compat 2019-03-05 06:59:13.000000000 +0000 @@ -1 +1 @@ -4.19 +5.0 diff -Nru spl-linux-0.7.12/debian/patches/0001-Add-check-for-ktime_get_coarse_real_ts64-for-V5.0-ke.patch spl-linux-0.7.13/debian/patches/0001-Add-check-for-ktime_get_coarse_real_ts64-for-V5.0-ke.patch --- spl-linux-0.7.12/debian/patches/0001-Add-check-for-ktime_get_coarse_real_ts64-for-V5.0-ke.patch 2019-01-18 14:50:01.000000000 +0000 +++ spl-linux-0.7.13/debian/patches/0001-Add-check-for-ktime_get_coarse_real_ts64-for-V5.0-ke.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,80 +0,0 @@ -Add support for ktime_get_coarse_real_ts64 for 5.0 - -Signed-off-by; Colin Ian King ---- - -Index: spl-linux-0.7.12/config/kernel-ktime.m4 -=================================================================== ---- /dev/null -+++ spl-linux-0.7.12/config/kernel-ktime-get-coarse-real-ts64.m4 -@@ -0,0 +1,20 @@ -+dnl # -+dnl # 5.0 API change -+dnl # current_kernel_time64 to ktime_get_coarse_real_ts64 timespec64 -+dnl # -+AC_DEFUN([SPL_AC_KERNEL_KTIME_GET_COARSE_REAL_TS64], [ -+ AC_MSG_CHECKING([whether ktime_get_coarse_real_ts64 exists]) -+ SPL_LINUX_TRY_COMPILE([ -+ #include -+ ],[ -+ struct timespec64 ts; -+ -+ ktime_get_coarse_real_ts64(&ts); -+ ],[ -+ AC_MSG_RESULT(yes) -+ AC_DEFINE(HAVE_KTIME_GET_COARSE_REAL_TS64, 1, -+ [ktime_get_coarse_real_ts64 is provided]) -+ ],[ -+ AC_MSG_RESULT(no) -+ ]) -+]) -Index: spl-linux-0.7.12/include/sys/time.h -=================================================================== ---- spl-linux-0.7.12.orig/include/sys/time.h -+++ spl-linux-0.7.12/include/sys/time.h -@@ -71,22 +71,32 @@ typedef struct timespec inode_timespec_ - - static inline void - gethrestime(inode_timespec_t *ts) -- { -+{ -+#if defined(HAVE_KTIME_GET_COARSE_REAL_TS64) -+ ktime_get_coarse_real_ts64(ts); -+#else - #if defined(HAVE_INODE_TIMESPEC64_TIMES) - *ts = current_kernel_time64(); - #else - *ts = current_kernel_time(); - #endif -+#endif - } - - static inline time_t - gethrestime_sec(void) - { -+#if defined(HAVE_KTIME_GET_COARSE_REAL_TS64) -+ inode_timespec_t ts; -+ -+ ktime_get_coarse_real_ts64(&ts); -+#else - #if defined(HAVE_INODE_TIMESPEC64_TIMES) - inode_timespec_t ts = current_kernel_time64(); - #else - inode_timespec_t ts = current_kernel_time(); - #endif -+#endif - return (ts.tv_sec); - } - -Index: spl-linux-0.7.12/config/spl-build.m4 -=================================================================== ---- spl-linux-0.7.12.orig/config/spl-build.m4 -+++ spl-linux-0.7.12/config/spl-build.m4 -@@ -54,6 +54,7 @@ AC_DEFUN([SPL_AC_CONFIG_KERNEL], [ - SPL_AC_KERNEL_WRITE - SPL_AC_KERNEL_READ - SPL_AC_KERNEL_TIMER_FUNCTION_TIMER_LIST -+ SPL_AC_KERNEL_KTIME_GET_COARSE_REAL_TS64 - ]) - - AC_DEFUN([SPL_AC_MODULE_SYMVERS], [ diff -Nru spl-linux-0.7.12/debian/patches/0002-Add-check-for-totalram-pages.patch spl-linux-0.7.13/debian/patches/0002-Add-check-for-totalram-pages.patch --- spl-linux-0.7.12/debian/patches/0002-Add-check-for-totalram-pages.patch 2019-01-18 14:49:57.000000000 +0000 +++ spl-linux-0.7.13/debian/patches/0002-Add-check-for-totalram-pages.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,60 +0,0 @@ -Add support for totalram-pages being a function for 5.0 - -Was a unsigned long, in 5.0 it is a inline'd function - -Signed-off-by; Colin Ian King ---- - -Index: spl-linux-0.7.12/config/kernel-totalram-pages.m4 -=================================================================== ---- /dev/null -+++ spl-linux-0.7.12/config/kernel-totalram-pages.m4 -@@ -0,0 +1,20 @@ -+dnl # -+dnl # 5.0 API change -+dnl # check if totalram_pages is a function -+dnl # -+AC_DEFUN([SPL_AC_KERNEL_TOTALRAM_PAGES_FUNCTION], [ -+ AC_MSG_CHECKING([whether totalram_pages is a function]) -+ SPL_LINUX_TRY_COMPILE([ -+ #include -+ ],[ -+ unsigned long t; -+ -+ t = totalram_pages(); -+ ],[ -+ AC_MSG_RESULT(yes) -+ AC_DEFINE(HAVE_TOTALRAM_PAGES_FUNCTION, 1, -+ [totalram_pages is a function]) -+ ],[ -+ AC_MSG_RESULT(no) -+ ]) -+]) -Index: spl-linux-0.7.12/config/spl-build.m4 -=================================================================== ---- spl-linux-0.7.12.orig/config/spl-build.m4 -+++ spl-linux-0.7.12/config/spl-build.m4 -@@ -55,6 +55,7 @@ AC_DEFUN([SPL_AC_CONFIG_KERNEL], [ - SPL_AC_KERNEL_READ - SPL_AC_KERNEL_TIMER_FUNCTION_TIMER_LIST - SPL_AC_KERNEL_KTIME_GET_COARSE_REAL_TS64 -+ SPL_AC_KERNEL_TOTALRAM_PAGES_FUNCTION - ]) - - AC_DEFUN([SPL_AC_MODULE_SYMVERS], [ -Index: spl-linux-0.7.12/include/sys/vmsystm.h -=================================================================== ---- spl-linux-0.7.12.orig/include/sys/vmsystm.h -+++ spl-linux-0.7.12/include/sys/vmsystm.h -@@ -34,7 +34,11 @@ - #include - - #define membar_producer() smp_wmb() -+#if defined(HAVE_TOTALRAM_PAGES_FUNCTION) -+#define physmem totalram_pages() -+#else - #define physmem totalram_pages -+#endif - #define freemem (nr_free_pages() + \ - global_page_state(NR_INACTIVE_FILE) + \ - global_page_state(NR_INACTIVE_ANON) + \ diff -Nru spl-linux-0.7.12/debian/patches/0003-Add-check-for-ktime_get_ts64-for-V5.0-ke.patch spl-linux-0.7.13/debian/patches/0003-Add-check-for-ktime_get_ts64-for-V5.0-ke.patch --- spl-linux-0.7.12/debian/patches/0003-Add-check-for-ktime_get_ts64-for-V5.0-ke.patch 2019-01-18 14:50:15.000000000 +0000 +++ spl-linux-0.7.13/debian/patches/0003-Add-check-for-ktime_get_ts64-for-V5.0-ke.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,42 +0,0 @@ -Add support for ktime_get_ts64 for 5.0 - -Signed-off-by; Colin Ian King ---- - -Index: spl-linux-0.7.12/config/kernel-ktime-get-ts64.m4 -=================================================================== ---- /dev/null -+++ spl-linux-0.7.12/config/kernel-ktime-get-ts64.m4 -@@ -0,0 +1,20 @@ -+dnl # -+dnl # 4.20 API change -+dnl # check if ktime_get_ts64 exists -+dnl # -+AC_DEFUN([SPL_AC_KERNEL_KTIME_GET_TS64], [ -+ AC_MSG_CHECKING([whether ktime_get_ts64 exists]) -+ SPL_LINUX_TRY_COMPILE([ -+ #include -+ ],[ -+ struct timespec64 ts; -+ -+ ktime_get_ts64(&ts); -+ ],[ -+ AC_MSG_RESULT(yes) -+ AC_DEFINE(HAVE_KTIME_GET_TS64, 1, -+ [ktime_get_ts64 is provided]) -+ ],[ -+ AC_MSG_RESULT(no) -+ ]) -+]) -Index: spl-linux-0.7.12/config/spl-build.m4 -=================================================================== ---- spl-linux-0.7.12.orig/config/spl-build.m4 -+++ spl-linux-0.7.12/config/spl-build.m4 -@@ -55,6 +55,7 @@ AC_DEFUN([SPL_AC_CONFIG_KERNEL], [ - SPL_AC_KERNEL_READ - SPL_AC_KERNEL_TIMER_FUNCTION_TIMER_LIST - SPL_AC_KERNEL_KTIME_GET_COARSE_REAL_TS64 -+ SPL_AC_KERNEL_KTIME_GET_TS64 - SPL_AC_KERNEL_TOTALRAM_PAGES_FUNCTION - ]) - diff -Nru spl-linux-0.7.12/debian/patches/0004-Add-check-for-timespec64-sub.patch spl-linux-0.7.13/debian/patches/0004-Add-check-for-timespec64-sub.patch --- spl-linux-0.7.12/debian/patches/0004-Add-check-for-timespec64-sub.patch 2019-01-18 14:50:33.000000000 +0000 +++ spl-linux-0.7.13/debian/patches/0004-Add-check-for-timespec64-sub.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,42 +0,0 @@ -Add support for timespec64 for 5.0 - -Signed-off-by; Colin Ian King ---- - -Index: spl-linux-0.7.12/config/kernel-timespec64.m4 -=================================================================== ---- /dev/null -+++ spl-linux-0.7.12/config/kernel-timespec64.m4 -@@ -0,0 +1,20 @@ -+dnl # -+dnl # 4.20 API change -+dnl # timespec64_sub replacing timespec_sub -+dnl # -+AC_DEFUN([SPL_AC_KERNEL_TIMESPEC64_SUB], [ -+ AC_MSG_CHECKING([whether timespec64_sub exists]) -+ SPL_LINUX_TRY_COMPILE([ -+ #include -+ ],[ -+ struct timespec64 ts1 = { 0 }, ts2 = { 0 }, delta; -+ -+ delta = timespec64_sub(ts1, ts2); -+ ],[ -+ AC_MSG_RESULT(yes) -+ AC_DEFINE(HAVE_TIMESPEC64_SUB, 1, -+ [timespec64_sub is provided]) -+ ],[ -+ AC_MSG_RESULT(no) -+ ]) -+]) -Index: spl-linux-0.7.12/config/spl-build.m4 -=================================================================== ---- spl-linux-0.7.12.orig/config/spl-build.m4 -+++ spl-linux-0.7.12/config/spl-build.m4 -@@ -56,6 +56,7 @@ AC_DEFUN([SPL_AC_CONFIG_KERNEL], [ - SPL_AC_KERNEL_TIMER_FUNCTION_TIMER_LIST - SPL_AC_KERNEL_KTIME_GET_COARSE_REAL_TS64 - SPL_AC_KERNEL_KTIME_GET_TS64 -+ SPL_AC_KERNEL_TIMESPEC64_SUB - SPL_AC_KERNEL_TOTALRAM_PAGES_FUNCTION - ]) - diff -Nru spl-linux-0.7.12/debian/patches/0005-Use-64-bit-timespec-fixes.patch spl-linux-0.7.13/debian/patches/0005-Use-64-bit-timespec-fixes.patch --- spl-linux-0.7.12/debian/patches/0005-Use-64-bit-timespec-fixes.patch 2019-01-18 14:50:52.000000000 +0000 +++ spl-linux-0.7.13/debian/patches/0005-Use-64-bit-timespec-fixes.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,180 +0,0 @@ -Add 64 bit timespec support for 5.0 - -Signed-off-by; Colin Ian King ---- - -Index: spl-linux-0.7.12/module/splat/splat-kmem.c -=================================================================== ---- spl-linux-0.7.12.orig/module/splat/splat-kmem.c -+++ spl-linux-0.7.12/module/splat/splat-kmem.c -@@ -713,7 +713,11 @@ splat_kmem_cache_thread_test(struct file - { - kmem_cache_priv_t *kcp; - kthread_t *thr; -+#if defined(HAVE_TIMESPEC64_SUB) -+ struct timespec64 start, stop, delta; -+#else - struct timespec start, stop, delta; -+#endif - char cache_name[32]; - int i, rc = 0; - -@@ -737,7 +741,11 @@ splat_kmem_cache_thread_test(struct file - goto out_kcp; - } - -+#if defined(HAVE_KTIME_GET_TS64) -+ ktime_get_ts64(&start); -+#else - getnstimeofday(&start); -+#endif - - for (i = 0; i < SPLAT_KMEM_THREADS; i++) { - thr = thread_create(NULL, 0, -@@ -762,14 +770,22 @@ splat_kmem_cache_thread_test(struct file - /* Sleep until all thread have finished */ - wait_event(kcp->kcp_ctl_waitq, splat_kmem_cache_test_threads(kcp, 0)); - -+#if defined(HAVE_KTIME_GET_TS64) -+ ktime_get_ts64(&stop); -+#else - getnstimeofday(&stop); -+#endif -+#if defined(HAVE_TIMESPEC64_SUB) -+ delta = timespec64_sub(stop, start); -+#else - delta = timespec_sub(stop, start); -+#endif - - splat_vprint(file, name, -- "%-22s %2ld.%09ld\t" -+ "%-22s %2lld.%09ld\t" - "%lu/%lu/%lu\t%lu/%lu/%lu\n", - kcp->kcp_cache->skc_name, -- delta.tv_sec, delta.tv_nsec, -+ (long long)delta.tv_sec, delta.tv_nsec, - (unsigned long)kcp->kcp_cache->skc_slab_total, - (unsigned long)kcp->kcp_cache->skc_slab_max, - (unsigned long)(kcp->kcp_alloc * -@@ -1226,7 +1242,11 @@ splat_kmem_test13(struct file *file, voi - kmem_cache_thread_t *kct; - dummy_page_t *dp; - struct list_head list; -+#if defined(HAVE_TIMESPEC64_SUB) -+ struct timespec64 start, stop, delta = { 0, 0 }; -+#else - struct timespec start, stop, delta = { 0, 0 }; -+#endif - int size, count, slabs, fails = 0; - int i, rc = 0, max_time = 10; - -@@ -1274,7 +1294,11 @@ splat_kmem_test13(struct file *file, voi - i = 0; - slabs = kcp->kcp_cache->skc_slab_total; - INIT_LIST_HEAD(&list); -+#if defined(HAVE_KTIME_GET_TS64) -+ ktime_get_ts64(&start); -+#else - getnstimeofday(&start); -+#endif - - /* Apply memory pressure */ - while (kcp->kcp_cache->skc_slab_total > (slabs >> 2)) { -@@ -1283,8 +1307,16 @@ splat_kmem_test13(struct file *file, voi - splat_kmem_cache_test_debug( - file, SPLAT_KMEM_TEST13_NAME, kcp); - -+#if defined(HAVE_KTIME_GET_TS64) -+ ktime_get_ts64(&stop); -+#else - getnstimeofday(&stop); -+#endif -+#if defined(HAVE_TIMESPEC64_SUB) -+ delta = timespec64_sub(stop, start); -+#else - delta = timespec_sub(stop, start); -+#endif - if (delta.tv_sec >= max_time) { - splat_vprint(file, SPLAT_KMEM_TEST13_NAME, - "Failed to reclaim 3/4 of cache in %ds, " -Index: spl-linux-0.7.12/module/splat/splat-taskq.c -=================================================================== ---- spl-linux-0.7.12.orig/module/splat/splat-taskq.c -+++ spl-linux-0.7.12/module/splat/splat-taskq.c -@@ -1077,14 +1077,22 @@ splat_taskq_throughput_func(void *arg) - static int - splat_taskq_throughput(struct file *file, void *arg, const char *name, - int nthreads, int minalloc, int maxalloc, int flags, int tasks, -+#if defined(HAVE_TIMESPEC64_SUB) -+ struct timespec64 *delta) -+#else - struct timespec *delta) -+#endif - { - taskq_t *tq; - taskqid_t id; - splat_taskq_arg_t tq_arg; - taskq_ent_t **tqes; - atomic_t count; -+#if defined(HAVE_TIMESPEC64_SUB) -+ struct timespec64 start, stop; -+#else - struct timespec start, stop; -+#endif - int i, j, rc = 0; - - tqes = vmalloc(sizeof (*tqes) * tasks); -@@ -1107,7 +1115,11 @@ splat_taskq_throughput(struct file *file - tq_arg.count = &count; - atomic_set(tq_arg.count, 0); - -+#if defined(HAVE_KTIME_GET_TS64) -+ ktime_get_ts64(&start); -+#else - getnstimeofday(&start); -+#endif - - for (i = 0; i < tasks; i++) { - tqes[i] = kmalloc(sizeof (taskq_ent_t), GFP_KERNEL); -@@ -1136,8 +1148,16 @@ splat_taskq_throughput(struct file *file - taskq_wait(tq); - - if (delta != NULL) { -+#if defined(HAVE_KTIME_GET_TS64) -+ ktime_get_ts64(&stop); -+#else - getnstimeofday(&stop); -+#endif -+#if defined(HAVE_TIMESPEC64_SUB) -+ *delta = timespec64_sub(stop, start); -+#else - *delta = timespec_sub(stop, start); -+#endif - } - - splat_vprint(file, name, "Taskq '%s' %d/%d dispatches finished\n", -@@ -1452,7 +1472,11 @@ out_free: - static int - splat_taskq_test11(struct file *file, void *arg) - { -+#if defined(HAVE_TIMESPEC64_SUB) -+ struct timespec64 normal, dynamic; -+#else - struct timespec normal, dynamic; -+#endif - int error; - - error = splat_taskq_throughput(file, arg, SPLAT_TASKQ_TEST11_NAME, -@@ -1468,9 +1492,9 @@ splat_taskq_test11(struct file *file, vo - return (error); - - splat_vprint(file, SPLAT_TASKQ_TEST11_NAME, -- "Timing taskq_wait(): normal=%ld.%09lds, dynamic=%ld.%09lds\n", -- normal.tv_sec, normal.tv_nsec, -- dynamic.tv_sec, dynamic.tv_nsec); -+ "Timing taskq_wait(): normal=%lld.%09lds, dynamic=%lld.%09lds\n", -+ (unsigned long long)normal.tv_sec, normal.tv_nsec, -+ (unsigned long long)dynamic.tv_sec, dynamic.tv_nsec); - - /* A 10x increase in runtime is used to indicate a core problem. */ - if (((int64_t)dynamic.tv_sec * NANOSEC + (int64_t)dynamic.tv_nsec) > diff -Nru spl-linux-0.7.12/debian/patches/series spl-linux-0.7.13/debian/patches/series --- spl-linux-0.7.12/debian/patches/series 2019-01-18 14:29:38.000000000 +0000 +++ spl-linux-0.7.13/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -0001-Add-check-for-ktime_get_coarse_real_ts64-for-V5.0-ke.patch -0002-Add-check-for-totalram-pages.patch -0003-Add-check-for-ktime_get_ts64-for-V5.0-ke.patch -0004-Add-check-for-timespec64-sub.patch -0005-Use-64-bit-timespec-fixes.patch diff -Nru spl-linux-0.7.12/debian/tests/control spl-linux-0.7.13/debian/tests/control --- spl-linux-0.7.12/debian/tests/control 2018-11-19 11:25:53.000000000 +0000 +++ spl-linux-0.7.13/debian/tests/control 2019-03-05 06:59:13.000000000 +0000 @@ -1,3 +1,3 @@ -Tests: dkms-test check.sh +Tests: check.sh Restrictions: needs-root, allow-stderr, isolation-machine -Depends: dkms +Depends: dkms, @ diff -Nru spl-linux-0.7.12/include/fs/Makefile.in spl-linux-0.7.13/include/fs/Makefile.in --- spl-linux-0.7.12/include/fs/Makefile.in 2018-11-09 01:09:46.000000000 +0000 +++ spl-linux-0.7.13/include/fs/Makefile.in 2019-02-22 17:59:36.000000000 +0000 @@ -40,11 +40,13 @@ $(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-current_kernel_time.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-inode-times.m4 \ $(top_srcdir)/config/kernel-kmem-cache.m4 \ + $(top_srcdir)/config/kernel-ktime_get_coarse_real_ts64.m4 \ $(top_srcdir)/config/kernel-kuidgid.m4 \ $(top_srcdir)/config/kernel-pde-data.m4 \ $(top_srcdir)/config/kernel-rw.m4 \ @@ -54,6 +56,8 @@ $(top_srcdir)/config/kernel-shrinker.m4 \ $(top_srcdir)/config/kernel-spinlock.m4 \ $(top_srcdir)/config/kernel-timer.m4 \ + $(top_srcdir)/config/kernel-timespec_sub.m4 \ + $(top_srcdir)/config/kernel-totalram-pages-func.m4 \ $(top_srcdir)/config/kernel-trim-unused-symbols.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-urange-sleep.m4 \ diff -Nru spl-linux-0.7.12/include/linux/Makefile.in spl-linux-0.7.13/include/linux/Makefile.in --- spl-linux-0.7.12/include/linux/Makefile.in 2018-11-09 01:09:46.000000000 +0000 +++ spl-linux-0.7.13/include/linux/Makefile.in 2019-02-22 17:59:36.000000000 +0000 @@ -40,11 +40,13 @@ $(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-current_kernel_time.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-inode-times.m4 \ $(top_srcdir)/config/kernel-kmem-cache.m4 \ + $(top_srcdir)/config/kernel-ktime_get_coarse_real_ts64.m4 \ $(top_srcdir)/config/kernel-kuidgid.m4 \ $(top_srcdir)/config/kernel-pde-data.m4 \ $(top_srcdir)/config/kernel-rw.m4 \ @@ -54,6 +56,8 @@ $(top_srcdir)/config/kernel-shrinker.m4 \ $(top_srcdir)/config/kernel-spinlock.m4 \ $(top_srcdir)/config/kernel-timer.m4 \ + $(top_srcdir)/config/kernel-timespec_sub.m4 \ + $(top_srcdir)/config/kernel-totalram-pages-func.m4 \ $(top_srcdir)/config/kernel-trim-unused-symbols.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-urange-sleep.m4 \ diff -Nru spl-linux-0.7.12/include/Makefile.in spl-linux-0.7.13/include/Makefile.in --- spl-linux-0.7.12/include/Makefile.in 2018-11-09 01:09:46.000000000 +0000 +++ spl-linux-0.7.13/include/Makefile.in 2019-02-22 17:59:36.000000000 +0000 @@ -40,11 +40,13 @@ $(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-current_kernel_time.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-inode-times.m4 \ $(top_srcdir)/config/kernel-kmem-cache.m4 \ + $(top_srcdir)/config/kernel-ktime_get_coarse_real_ts64.m4 \ $(top_srcdir)/config/kernel-kuidgid.m4 \ $(top_srcdir)/config/kernel-pde-data.m4 \ $(top_srcdir)/config/kernel-rw.m4 \ @@ -54,6 +56,8 @@ $(top_srcdir)/config/kernel-shrinker.m4 \ $(top_srcdir)/config/kernel-spinlock.m4 \ $(top_srcdir)/config/kernel-timer.m4 \ + $(top_srcdir)/config/kernel-timespec_sub.m4 \ + $(top_srcdir)/config/kernel-totalram-pages-func.m4 \ $(top_srcdir)/config/kernel-trim-unused-symbols.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-urange-sleep.m4 \ diff -Nru spl-linux-0.7.12/include/rpc/Makefile.in spl-linux-0.7.13/include/rpc/Makefile.in --- spl-linux-0.7.12/include/rpc/Makefile.in 2018-11-09 01:09:46.000000000 +0000 +++ spl-linux-0.7.13/include/rpc/Makefile.in 2019-02-22 17:59:36.000000000 +0000 @@ -40,11 +40,13 @@ $(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-current_kernel_time.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-inode-times.m4 \ $(top_srcdir)/config/kernel-kmem-cache.m4 \ + $(top_srcdir)/config/kernel-ktime_get_coarse_real_ts64.m4 \ $(top_srcdir)/config/kernel-kuidgid.m4 \ $(top_srcdir)/config/kernel-pde-data.m4 \ $(top_srcdir)/config/kernel-rw.m4 \ @@ -54,6 +56,8 @@ $(top_srcdir)/config/kernel-shrinker.m4 \ $(top_srcdir)/config/kernel-spinlock.m4 \ $(top_srcdir)/config/kernel-timer.m4 \ + $(top_srcdir)/config/kernel-timespec_sub.m4 \ + $(top_srcdir)/config/kernel-totalram-pages-func.m4 \ $(top_srcdir)/config/kernel-trim-unused-symbols.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-urange-sleep.m4 \ diff -Nru spl-linux-0.7.12/include/sharefs/Makefile.in spl-linux-0.7.13/include/sharefs/Makefile.in --- spl-linux-0.7.12/include/sharefs/Makefile.in 2018-11-09 01:09:46.000000000 +0000 +++ spl-linux-0.7.13/include/sharefs/Makefile.in 2019-02-22 17:59:36.000000000 +0000 @@ -40,11 +40,13 @@ $(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-current_kernel_time.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-inode-times.m4 \ $(top_srcdir)/config/kernel-kmem-cache.m4 \ + $(top_srcdir)/config/kernel-ktime_get_coarse_real_ts64.m4 \ $(top_srcdir)/config/kernel-kuidgid.m4 \ $(top_srcdir)/config/kernel-pde-data.m4 \ $(top_srcdir)/config/kernel-rw.m4 \ @@ -54,6 +56,8 @@ $(top_srcdir)/config/kernel-shrinker.m4 \ $(top_srcdir)/config/kernel-spinlock.m4 \ $(top_srcdir)/config/kernel-timer.m4 \ + $(top_srcdir)/config/kernel-timespec_sub.m4 \ + $(top_srcdir)/config/kernel-totalram-pages-func.m4 \ $(top_srcdir)/config/kernel-trim-unused-symbols.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-urange-sleep.m4 \ diff -Nru spl-linux-0.7.12/include/sys/fm/Makefile.in spl-linux-0.7.13/include/sys/fm/Makefile.in --- spl-linux-0.7.12/include/sys/fm/Makefile.in 2018-11-09 01:09:46.000000000 +0000 +++ spl-linux-0.7.13/include/sys/fm/Makefile.in 2019-02-22 17:59:36.000000000 +0000 @@ -40,11 +40,13 @@ $(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-current_kernel_time.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-inode-times.m4 \ $(top_srcdir)/config/kernel-kmem-cache.m4 \ + $(top_srcdir)/config/kernel-ktime_get_coarse_real_ts64.m4 \ $(top_srcdir)/config/kernel-kuidgid.m4 \ $(top_srcdir)/config/kernel-pde-data.m4 \ $(top_srcdir)/config/kernel-rw.m4 \ @@ -54,6 +56,8 @@ $(top_srcdir)/config/kernel-shrinker.m4 \ $(top_srcdir)/config/kernel-spinlock.m4 \ $(top_srcdir)/config/kernel-timer.m4 \ + $(top_srcdir)/config/kernel-timespec_sub.m4 \ + $(top_srcdir)/config/kernel-totalram-pages-func.m4 \ $(top_srcdir)/config/kernel-trim-unused-symbols.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-urange-sleep.m4 \ diff -Nru spl-linux-0.7.12/include/sys/fs/Makefile.in spl-linux-0.7.13/include/sys/fs/Makefile.in --- spl-linux-0.7.12/include/sys/fs/Makefile.in 2018-11-09 01:09:46.000000000 +0000 +++ spl-linux-0.7.13/include/sys/fs/Makefile.in 2019-02-22 17:59:36.000000000 +0000 @@ -40,11 +40,13 @@ $(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-current_kernel_time.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-inode-times.m4 \ $(top_srcdir)/config/kernel-kmem-cache.m4 \ + $(top_srcdir)/config/kernel-ktime_get_coarse_real_ts64.m4 \ $(top_srcdir)/config/kernel-kuidgid.m4 \ $(top_srcdir)/config/kernel-pde-data.m4 \ $(top_srcdir)/config/kernel-rw.m4 \ @@ -54,6 +56,8 @@ $(top_srcdir)/config/kernel-shrinker.m4 \ $(top_srcdir)/config/kernel-spinlock.m4 \ $(top_srcdir)/config/kernel-timer.m4 \ + $(top_srcdir)/config/kernel-timespec_sub.m4 \ + $(top_srcdir)/config/kernel-totalram-pages-func.m4 \ $(top_srcdir)/config/kernel-trim-unused-symbols.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-urange-sleep.m4 \ diff -Nru spl-linux-0.7.12/include/sys/Makefile.in spl-linux-0.7.13/include/sys/Makefile.in --- spl-linux-0.7.12/include/sys/Makefile.in 2018-11-09 01:09:46.000000000 +0000 +++ spl-linux-0.7.13/include/sys/Makefile.in 2019-02-22 17:59:36.000000000 +0000 @@ -40,11 +40,13 @@ $(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-current_kernel_time.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-inode-times.m4 \ $(top_srcdir)/config/kernel-kmem-cache.m4 \ + $(top_srcdir)/config/kernel-ktime_get_coarse_real_ts64.m4 \ $(top_srcdir)/config/kernel-kuidgid.m4 \ $(top_srcdir)/config/kernel-pde-data.m4 \ $(top_srcdir)/config/kernel-rw.m4 \ @@ -54,6 +56,8 @@ $(top_srcdir)/config/kernel-shrinker.m4 \ $(top_srcdir)/config/kernel-spinlock.m4 \ $(top_srcdir)/config/kernel-timer.m4 \ + $(top_srcdir)/config/kernel-timespec_sub.m4 \ + $(top_srcdir)/config/kernel-totalram-pages-func.m4 \ $(top_srcdir)/config/kernel-trim-unused-symbols.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-urange-sleep.m4 \ diff -Nru spl-linux-0.7.12/include/sys/time.h spl-linux-0.7.13/include/sys/time.h --- spl-linux-0.7.12/include/sys/time.h 2018-11-08 22:40:46.000000000 +0000 +++ spl-linux-0.7.13/include/sys/time.h 2019-02-22 17:55:48.000000000 +0000 @@ -27,6 +27,7 @@ #include #include +#include #include #include @@ -57,6 +58,17 @@ static const int hz = HZ; +/* 5.0 kernels no longer have timespec_sub(), only timespec64_sub() */ +#if !defined(HAVE_KERNEL_TIMESPEC_SUB) && defined(HAVE_INODE_TIMESPEC64_TIMES) +static inline struct timespec timespec_sub(struct timespec a, + struct timespec b) { + struct timespec64 res; + res = timespec64_sub(timespec_to_timespec64(a), + timespec_to_timespec64(b)); + return timespec64_to_timespec(res); +} +#endif + #define TIMESPEC_OVERFLOW(ts) \ ((ts)->tv_sec < TIME_MIN || (ts)->tv_sec > TIME_MAX) @@ -73,17 +85,43 @@ gethrestime(inode_timespec_t *ts) { #if defined(HAVE_INODE_TIMESPEC64_TIMES) + +#if defined(HAVE_KTIME_GET_COARSE_REAL_TS64) + ktime_get_coarse_real_ts64(ts); +#else *ts = current_kernel_time64(); +#endif /* HAVE_KTIME_GET_COARSE_REAL_TS64 */ + #else *ts = current_kernel_time(); #endif } +/* + * 4.20 kernels no longer have current_kernel_time(), only + * current_kernel_time64(). + */ +#if !defined(HAVE_KERNEL_CURRENT_TIME) && defined(HAVE_INODE_TIMESPEC64_TIMES) +static inline struct timespec current_kernel_time(void) +{ + struct timespec64 ts; + gethrestime(&ts); + return timespec64_to_timespec(ts); +} +#endif + static inline time_t gethrestime_sec(void) { #if defined(HAVE_INODE_TIMESPEC64_TIMES) + +#if defined(HAVE_KTIME_GET_COARSE_REAL_TS64) + inode_timespec_t ts; + ktime_get_coarse_real_ts64(&ts); +#else inode_timespec_t ts = current_kernel_time64(); +#endif /* HAVE_KTIME_GET_COARSE_REAL_TS64 */ + #else inode_timespec_t ts = current_kernel_time(); #endif diff -Nru spl-linux-0.7.12/include/sys/uio.h spl-linux-0.7.13/include/sys/uio.h --- spl-linux-0.7.12/include/sys/uio.h 2018-11-08 22:40:46.000000000 +0000 +++ spl-linux-0.7.13/include/sys/uio.h 2019-02-22 17:55:48.000000000 +0000 @@ -53,6 +53,7 @@ int uio_iovcnt; offset_t uio_loffset; uio_seg_t uio_segflg; + boolean_t uio_fault_disable; uint16_t uio_fmode; uint16_t uio_extflg; offset_t uio_limit; diff -Nru spl-linux-0.7.12/include/sys/vmsystm.h spl-linux-0.7.13/include/sys/vmsystm.h --- spl-linux-0.7.12/include/sys/vmsystm.h 2018-11-08 22:40:46.000000000 +0000 +++ spl-linux-0.7.13/include/sys/vmsystm.h 2019-02-22 17:55:48.000000000 +0000 @@ -33,8 +33,14 @@ #include #include +#ifdef HAVE_TOTALRAM_PAGES_FUNC +#define zfs_totalram_pages totalram_pages() +#else +#define zfs_totalram_pages totalram_pages +#endif + #define membar_producer() smp_wmb() -#define physmem totalram_pages +#define physmem zfs_totalram_pages #define freemem (nr_free_pages() + \ global_page_state(NR_INACTIVE_FILE) + \ global_page_state(NR_INACTIVE_ANON) + \ diff -Nru spl-linux-0.7.12/include/util/Makefile.in spl-linux-0.7.13/include/util/Makefile.in --- spl-linux-0.7.12/include/util/Makefile.in 2018-11-09 01:09:46.000000000 +0000 +++ spl-linux-0.7.13/include/util/Makefile.in 2019-02-22 17:59:36.000000000 +0000 @@ -40,11 +40,13 @@ $(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-current_kernel_time.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-inode-times.m4 \ $(top_srcdir)/config/kernel-kmem-cache.m4 \ + $(top_srcdir)/config/kernel-ktime_get_coarse_real_ts64.m4 \ $(top_srcdir)/config/kernel-kuidgid.m4 \ $(top_srcdir)/config/kernel-pde-data.m4 \ $(top_srcdir)/config/kernel-rw.m4 \ @@ -54,6 +56,8 @@ $(top_srcdir)/config/kernel-shrinker.m4 \ $(top_srcdir)/config/kernel-spinlock.m4 \ $(top_srcdir)/config/kernel-timer.m4 \ + $(top_srcdir)/config/kernel-timespec_sub.m4 \ + $(top_srcdir)/config/kernel-totalram-pages-func.m4 \ $(top_srcdir)/config/kernel-trim-unused-symbols.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-urange-sleep.m4 \ diff -Nru spl-linux-0.7.12/include/vm/Makefile.in spl-linux-0.7.13/include/vm/Makefile.in --- spl-linux-0.7.12/include/vm/Makefile.in 2018-11-09 01:09:46.000000000 +0000 +++ spl-linux-0.7.13/include/vm/Makefile.in 2019-02-22 17:59:36.000000000 +0000 @@ -40,11 +40,13 @@ $(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-current_kernel_time.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-inode-times.m4 \ $(top_srcdir)/config/kernel-kmem-cache.m4 \ + $(top_srcdir)/config/kernel-ktime_get_coarse_real_ts64.m4 \ $(top_srcdir)/config/kernel-kuidgid.m4 \ $(top_srcdir)/config/kernel-pde-data.m4 \ $(top_srcdir)/config/kernel-rw.m4 \ @@ -54,6 +56,8 @@ $(top_srcdir)/config/kernel-shrinker.m4 \ $(top_srcdir)/config/kernel-spinlock.m4 \ $(top_srcdir)/config/kernel-timer.m4 \ + $(top_srcdir)/config/kernel-timespec_sub.m4 \ + $(top_srcdir)/config/kernel-totalram-pages-func.m4 \ $(top_srcdir)/config/kernel-trim-unused-symbols.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-urange-sleep.m4 \ diff -Nru spl-linux-0.7.12/lib/Makefile.in spl-linux-0.7.13/lib/Makefile.in --- spl-linux-0.7.12/lib/Makefile.in 2018-11-09 01:09:46.000000000 +0000 +++ spl-linux-0.7.13/lib/Makefile.in 2019-02-22 17:59:36.000000000 +0000 @@ -48,11 +48,13 @@ subdir = lib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/kernel-ctl-table-name.m4 \ + $(top_srcdir)/config/kernel-current_kernel_time.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-inode-times.m4 \ $(top_srcdir)/config/kernel-kmem-cache.m4 \ + $(top_srcdir)/config/kernel-ktime_get_coarse_real_ts64.m4 \ $(top_srcdir)/config/kernel-kuidgid.m4 \ $(top_srcdir)/config/kernel-pde-data.m4 \ $(top_srcdir)/config/kernel-rw.m4 \ @@ -62,6 +64,8 @@ $(top_srcdir)/config/kernel-shrinker.m4 \ $(top_srcdir)/config/kernel-spinlock.m4 \ $(top_srcdir)/config/kernel-timer.m4 \ + $(top_srcdir)/config/kernel-timespec_sub.m4 \ + $(top_srcdir)/config/kernel-totalram-pages-func.m4 \ $(top_srcdir)/config/kernel-trim-unused-symbols.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-urange-sleep.m4 \ diff -Nru spl-linux-0.7.12/Makefile.in spl-linux-0.7.13/Makefile.in --- spl-linux-0.7.12/Makefile.in 2018-11-09 01:09:46.000000000 +0000 +++ spl-linux-0.7.13/Makefile.in 2019-02-22 17:59:36.000000000 +0000 @@ -86,11 +86,13 @@ subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/kernel-ctl-table-name.m4 \ + $(top_srcdir)/config/kernel-current_kernel_time.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-inode-times.m4 \ $(top_srcdir)/config/kernel-kmem-cache.m4 \ + $(top_srcdir)/config/kernel-ktime_get_coarse_real_ts64.m4 \ $(top_srcdir)/config/kernel-kuidgid.m4 \ $(top_srcdir)/config/kernel-pde-data.m4 \ $(top_srcdir)/config/kernel-rw.m4 \ @@ -100,6 +102,8 @@ $(top_srcdir)/config/kernel-shrinker.m4 \ $(top_srcdir)/config/kernel-spinlock.m4 \ $(top_srcdir)/config/kernel-timer.m4 \ + $(top_srcdir)/config/kernel-timespec_sub.m4 \ + $(top_srcdir)/config/kernel-totalram-pages-func.m4 \ $(top_srcdir)/config/kernel-trim-unused-symbols.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-urange-sleep.m4 \ diff -Nru spl-linux-0.7.12/man/Makefile.in spl-linux-0.7.13/man/Makefile.in --- spl-linux-0.7.12/man/Makefile.in 2018-11-09 01:09:46.000000000 +0000 +++ spl-linux-0.7.13/man/Makefile.in 2019-02-22 17:59:36.000000000 +0000 @@ -38,11 +38,13 @@ DIST_COMMON = $(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-current_kernel_time.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-inode-times.m4 \ $(top_srcdir)/config/kernel-kmem-cache.m4 \ + $(top_srcdir)/config/kernel-ktime_get_coarse_real_ts64.m4 \ $(top_srcdir)/config/kernel-kuidgid.m4 \ $(top_srcdir)/config/kernel-pde-data.m4 \ $(top_srcdir)/config/kernel-rw.m4 \ @@ -52,6 +54,8 @@ $(top_srcdir)/config/kernel-shrinker.m4 \ $(top_srcdir)/config/kernel-spinlock.m4 \ $(top_srcdir)/config/kernel-timer.m4 \ + $(top_srcdir)/config/kernel-timespec_sub.m4 \ + $(top_srcdir)/config/kernel-totalram-pages-func.m4 \ $(top_srcdir)/config/kernel-trim-unused-symbols.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-urange-sleep.m4 \ diff -Nru spl-linux-0.7.12/man/man1/Makefile.in spl-linux-0.7.13/man/man1/Makefile.in --- spl-linux-0.7.12/man/man1/Makefile.in 2018-11-09 01:09:46.000000000 +0000 +++ spl-linux-0.7.13/man/man1/Makefile.in 2019-02-22 17:59:36.000000000 +0000 @@ -39,11 +39,13 @@ $(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-current_kernel_time.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-inode-times.m4 \ $(top_srcdir)/config/kernel-kmem-cache.m4 \ + $(top_srcdir)/config/kernel-ktime_get_coarse_real_ts64.m4 \ $(top_srcdir)/config/kernel-kuidgid.m4 \ $(top_srcdir)/config/kernel-pde-data.m4 \ $(top_srcdir)/config/kernel-rw.m4 \ @@ -53,6 +55,8 @@ $(top_srcdir)/config/kernel-shrinker.m4 \ $(top_srcdir)/config/kernel-spinlock.m4 \ $(top_srcdir)/config/kernel-timer.m4 \ + $(top_srcdir)/config/kernel-timespec_sub.m4 \ + $(top_srcdir)/config/kernel-totalram-pages-func.m4 \ $(top_srcdir)/config/kernel-trim-unused-symbols.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-urange-sleep.m4 \ diff -Nru spl-linux-0.7.12/man/man5/Makefile.in spl-linux-0.7.13/man/man5/Makefile.in --- spl-linux-0.7.12/man/man5/Makefile.in 2018-11-09 01:09:46.000000000 +0000 +++ spl-linux-0.7.13/man/man5/Makefile.in 2019-02-22 17:59:36.000000000 +0000 @@ -39,11 +39,13 @@ $(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-current_kernel_time.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-inode-times.m4 \ $(top_srcdir)/config/kernel-kmem-cache.m4 \ + $(top_srcdir)/config/kernel-ktime_get_coarse_real_ts64.m4 \ $(top_srcdir)/config/kernel-kuidgid.m4 \ $(top_srcdir)/config/kernel-pde-data.m4 \ $(top_srcdir)/config/kernel-rw.m4 \ @@ -53,6 +55,8 @@ $(top_srcdir)/config/kernel-shrinker.m4 \ $(top_srcdir)/config/kernel-spinlock.m4 \ $(top_srcdir)/config/kernel-timer.m4 \ + $(top_srcdir)/config/kernel-timespec_sub.m4 \ + $(top_srcdir)/config/kernel-totalram-pages-func.m4 \ $(top_srcdir)/config/kernel-trim-unused-symbols.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-urange-sleep.m4 \ diff -Nru spl-linux-0.7.12/META spl-linux-0.7.13/META --- spl-linux-0.7.12/META 2018-11-09 01:09:54.000000000 +0000 +++ spl-linux-0.7.13/META 2019-02-22 17:59:45.000000000 +0000 @@ -1,7 +1,7 @@ Meta: 1 Name: spl Branch: 1.0 -Version: 0.7.12 +Version: 0.7.13 Release: 1 Release-Tags: relext License: GPL diff -Nru spl-linux-0.7.12/module/Makefile.in spl-linux-0.7.13/module/Makefile.in --- spl-linux-0.7.12/module/Makefile.in 2018-11-08 22:40:46.000000000 +0000 +++ spl-linux-0.7.13/module/Makefile.in 2019-02-22 17:55:48.000000000 +0000 @@ -8,19 +8,19 @@ export SPL_MODULE_CFLAGS modules: - $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ CONFIG_SPL=m $@ + $(MAKE) -C @LINUX_OBJ@ M=`pwd` @KERNELMAKE_PARAMS@ CONFIG_SPL=m $@ clean: @# Only cleanup the kernel build directories when CONFIG_KERNEL @# is defined. This indicates that kernel modules should be built. -@CONFIG_KERNEL_TRUE@ $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ $@ +@CONFIG_KERNEL_TRUE@ $(MAKE) -C @LINUX_OBJ@ M=`pwd` @KERNELMAKE_PARAMS@ $@ if [ -f @LINUX_SYMBOLS@ ]; then $(RM) @LINUX_SYMBOLS@; fi if [ -f Module.markers ]; then $(RM) Module.markers; fi modules_install: @# Install the kernel modules - $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \ + $(MAKE) -C @LINUX_OBJ@ M=`pwd` $@ \ INSTALL_MOD_PATH=$(DESTDIR)$(INSTALL_MOD_PATH) \ INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) \ KERNELRELEASE=@LINUX_VERSION@ diff -Nru spl-linux-0.7.12/module/splat/splat-kmem.c spl-linux-0.7.13/module/splat/splat-kmem.c --- spl-linux-0.7.12/module/splat/splat-kmem.c 2018-11-09 01:09:54.000000000 +0000 +++ spl-linux-0.7.13/module/splat/splat-kmem.c 2019-02-22 17:59:45.000000000 +0000 @@ -30,6 +30,7 @@ #include #include #include +#include #include "splat-internal.h" #define SPLAT_KMEM_NAME "kmem" diff -Nru spl-linux-0.7.12/rpm/generic/Makefile.in spl-linux-0.7.13/rpm/generic/Makefile.in --- spl-linux-0.7.12/rpm/generic/Makefile.in 2018-11-09 01:09:46.000000000 +0000 +++ spl-linux-0.7.13/rpm/generic/Makefile.in 2019-02-22 17:59:36.000000000 +0000 @@ -40,11 +40,13 @@ $(srcdir)/spl.spec.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/kernel-ctl-table-name.m4 \ + $(top_srcdir)/config/kernel-current_kernel_time.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-inode-times.m4 \ $(top_srcdir)/config/kernel-kmem-cache.m4 \ + $(top_srcdir)/config/kernel-ktime_get_coarse_real_ts64.m4 \ $(top_srcdir)/config/kernel-kuidgid.m4 \ $(top_srcdir)/config/kernel-pde-data.m4 \ $(top_srcdir)/config/kernel-rw.m4 \ @@ -54,6 +56,8 @@ $(top_srcdir)/config/kernel-shrinker.m4 \ $(top_srcdir)/config/kernel-spinlock.m4 \ $(top_srcdir)/config/kernel-timer.m4 \ + $(top_srcdir)/config/kernel-timespec_sub.m4 \ + $(top_srcdir)/config/kernel-totalram-pages-func.m4 \ $(top_srcdir)/config/kernel-trim-unused-symbols.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-urange-sleep.m4 \ diff -Nru spl-linux-0.7.12/rpm/generic/spl-kmod.spec.in spl-linux-0.7.13/rpm/generic/spl-kmod.spec.in --- spl-linux-0.7.12/rpm/generic/spl-kmod.spec.in 2018-11-08 22:40:46.000000000 +0000 +++ spl-linux-0.7.13/rpm/generic/spl-kmod.spec.in 2019-02-22 17:55:48.000000000 +0000 @@ -171,6 +171,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Feb 22 2019 Tony Hutter - 0.7.13-1 +- Released 0.7.13-1, detailed release notes are available at: +- https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.13 * Thu Nov 08 2018 Tony Hutter - 0.7.12-1 - Released 0.7.12-1, detailed release notes are available at: - https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.12 diff -Nru spl-linux-0.7.12/rpm/generic/spl.spec.in spl-linux-0.7.13/rpm/generic/spl.spec.in --- spl-linux-0.7.12/rpm/generic/spl.spec.in 2018-11-08 22:40:46.000000000 +0000 +++ spl-linux-0.7.13/rpm/generic/spl.spec.in 2019-02-22 17:55:48.000000000 +0000 @@ -47,6 +47,9 @@ %{_mandir}/man5/* %changelog +* Fri Feb 22 2019 Tony Hutter - 0.7.13-1 +- Released 0.7.13-1, detailed release notes are available at: +- https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.13 * Thu Nov 08 2018 Tony Hutter - 0.7.12-1 - Released 0.7.12-1, detailed release notes are available at: - https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.12 diff -Nru spl-linux-0.7.12/rpm/Makefile.in spl-linux-0.7.13/rpm/Makefile.in --- spl-linux-0.7.12/rpm/Makefile.in 2018-11-09 01:09:46.000000000 +0000 +++ spl-linux-0.7.13/rpm/Makefile.in 2019-02-22 17:59:36.000000000 +0000 @@ -38,11 +38,13 @@ DIST_COMMON = $(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-current_kernel_time.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-inode-times.m4 \ $(top_srcdir)/config/kernel-kmem-cache.m4 \ + $(top_srcdir)/config/kernel-ktime_get_coarse_real_ts64.m4 \ $(top_srcdir)/config/kernel-kuidgid.m4 \ $(top_srcdir)/config/kernel-pde-data.m4 \ $(top_srcdir)/config/kernel-rw.m4 \ @@ -52,6 +54,8 @@ $(top_srcdir)/config/kernel-shrinker.m4 \ $(top_srcdir)/config/kernel-spinlock.m4 \ $(top_srcdir)/config/kernel-timer.m4 \ + $(top_srcdir)/config/kernel-timespec_sub.m4 \ + $(top_srcdir)/config/kernel-totalram-pages-func.m4 \ $(top_srcdir)/config/kernel-trim-unused-symbols.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-urange-sleep.m4 \ diff -Nru spl-linux-0.7.12/rpm/redhat/Makefile.in spl-linux-0.7.13/rpm/redhat/Makefile.in --- spl-linux-0.7.12/rpm/redhat/Makefile.in 2018-11-09 01:09:46.000000000 +0000 +++ spl-linux-0.7.13/rpm/redhat/Makefile.in 2019-02-22 17:59:36.000000000 +0000 @@ -40,11 +40,13 @@ $(srcdir)/spl.spec.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/kernel-ctl-table-name.m4 \ + $(top_srcdir)/config/kernel-current_kernel_time.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-inode-times.m4 \ $(top_srcdir)/config/kernel-kmem-cache.m4 \ + $(top_srcdir)/config/kernel-ktime_get_coarse_real_ts64.m4 \ $(top_srcdir)/config/kernel-kuidgid.m4 \ $(top_srcdir)/config/kernel-pde-data.m4 \ $(top_srcdir)/config/kernel-rw.m4 \ @@ -54,6 +56,8 @@ $(top_srcdir)/config/kernel-shrinker.m4 \ $(top_srcdir)/config/kernel-spinlock.m4 \ $(top_srcdir)/config/kernel-timer.m4 \ + $(top_srcdir)/config/kernel-timespec_sub.m4 \ + $(top_srcdir)/config/kernel-totalram-pages-func.m4 \ $(top_srcdir)/config/kernel-trim-unused-symbols.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-urange-sleep.m4 \ diff -Nru spl-linux-0.7.12/rpm/redhat/spl.spec.in spl-linux-0.7.13/rpm/redhat/spl.spec.in --- spl-linux-0.7.12/rpm/redhat/spl.spec.in 2018-11-08 22:40:46.000000000 +0000 +++ spl-linux-0.7.13/rpm/redhat/spl.spec.in 2019-02-22 17:55:48.000000000 +0000 @@ -47,6 +47,9 @@ %{_mandir}/man5/* %changelog +* Fri Feb 22 2019 Tony Hutter - 0.7.13-1 +- Released 0.7.13-1, detailed release notes are available at: +- https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.13 * Thu Nov 08 2018 Tony Hutter - 0.7.12-1 - Released 0.7.12-1, detailed release notes are available at: - https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.12 diff -Nru spl-linux-0.7.12/scripts/Makefile.in spl-linux-0.7.13/scripts/Makefile.in --- spl-linux-0.7.12/scripts/Makefile.in 2018-11-09 01:09:46.000000000 +0000 +++ spl-linux-0.7.13/scripts/Makefile.in 2019-02-22 17:59:36.000000000 +0000 @@ -38,11 +38,13 @@ DIST_COMMON = $(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-current_kernel_time.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-inode-times.m4 \ $(top_srcdir)/config/kernel-kmem-cache.m4 \ + $(top_srcdir)/config/kernel-ktime_get_coarse_real_ts64.m4 \ $(top_srcdir)/config/kernel-kuidgid.m4 \ $(top_srcdir)/config/kernel-pde-data.m4 \ $(top_srcdir)/config/kernel-rw.m4 \ @@ -52,6 +54,8 @@ $(top_srcdir)/config/kernel-shrinker.m4 \ $(top_srcdir)/config/kernel-spinlock.m4 \ $(top_srcdir)/config/kernel-timer.m4 \ + $(top_srcdir)/config/kernel-timespec_sub.m4 \ + $(top_srcdir)/config/kernel-totalram-pages-func.m4 \ $(top_srcdir)/config/kernel-trim-unused-symbols.m4 \ $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-urange-sleep.m4 \ diff -Nru spl-linux-0.7.12/spl_config.h.in spl-linux-0.7.13/spl_config.h.in --- spl-linux-0.7.12/spl_config.h.in 2018-11-09 01:09:43.000000000 +0000 +++ spl-linux-0.7.13/spl_config.h.in 2019-02-22 17:59:33.000000000 +0000 @@ -69,12 +69,18 @@ /* yes */ #undef HAVE_IO_SCHEDULE_TIMEOUT +/* current_kernel_time() exists */ +#undef HAVE_KERNEL_CURRENT_TIME + /* kernel_read() take loff_t pointer */ #undef HAVE_KERNEL_READ_PPOS /* timer_list.function gets a timer_list */ #undef HAVE_KERNEL_TIMER_FUNCTION_TIMER_LIST +/* kernel has timespec_sub */ +#undef HAVE_KERNEL_TIMESPEC_SUB + /* kernel_write() take loff_t pointer */ #undef HAVE_KERNEL_WRITE_PPOS @@ -87,6 +93,9 @@ /* struct kmem_cache has gfpflags */ #undef HAVE_KMEM_CACHE_GFPFLAGS +/* ktime_get_coarse_real_ts64() exists */ +#undef HAVE_KTIME_GET_COARSE_REAL_TS64 + /* kuid_t/kgid_t in use */ #undef HAVE_KUIDGID_T @@ -135,6 +144,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_TYPES_H +/* kernel has totalram_pages() */ +#undef HAVE_TOTALRAM_PAGES_FUNC + /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H