Commit f3083bd4 authored by Mo Zhou's avatar Mo Zhou

New upstream version 0.7.13

parent e8db2baf
Meta: 1
Name: spl
Branch: 1.0
Version: 0.7.12
Version: 0.7.13
Release: 1
Release-Tags: relext
License: GPL
......
......@@ -86,11 +86,13 @@ DIST_COMMON = $(am__configure_deps) $(am__extra_HEADERS_DIST) \
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 @@ am__aclocal_m4_deps = $(top_srcdir)/config/kernel-ctl-table-name.m4 \
$(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 \
......
......@@ -1017,11 +1017,13 @@ AC_SUBST([am__untar])
]) # _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-set-fs-pwd.m4])
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])
......
......@@ -38,11 +38,13 @@ subdir = cmd
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 @@ am__aclocal_m4_deps = $(top_srcdir)/config/kernel-ctl-table-name.m4 \
$(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 \
......
......@@ -49,11 +49,13 @@ sbin_PROGRAMS = splat$(EXEEXT)
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 @@ am__aclocal_m4_deps = $(top_srcdir)/config/kernel-ctl-table-name.m4 \
$(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 \
......
......@@ -39,11 +39,13 @@ subdir = cmd/splslab
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 @@ am__aclocal_m4_deps = $(top_srcdir)/config/kernel-ctl-table-name.m4 \
$(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 \
......
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 <linux/ktime.h>
], [
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)
])
])
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 <linux/mm.h>
], [
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)
])
])
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 <linux/time.h>
],[
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)
])
])
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 <linux/mm.h>
],[
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)
])
])
......@@ -54,6 +54,10 @@ 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
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 @@ AC_DEFUN([SPL_AC_KERNEL], [
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
......
This diff is collapsed.
......@@ -40,11 +40,13 @@ 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-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 @@ am__aclocal_m4_deps = $(top_srcdir)/config/kernel-ctl-table-name.m4 \
$(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 \
......
......@@ -40,11 +40,13 @@ 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-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 @@ am__aclocal_m4_deps = $(top_srcdir)/config/kernel-ctl-table-name.m4 \
$(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 \
......
......@@ -40,11 +40,13 @@ 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-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 @@ am__aclocal_m4_deps = $(top_srcdir)/config/kernel-ctl-table-name.m4 \
$(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 \
......
......@@ -40,11 +40,13 @@ 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-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 @@ am__aclocal_m4_deps = $(top_srcdir)/config/kernel-ctl-table-name.m4 \
$(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 \
......
......@@ -40,11 +40,13 @@ 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-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 @@ am__aclocal_m4_deps = $(top_srcdir)/config/kernel-ctl-table-name.m4 \
$(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 \
......
......@@ -40,11 +40,13 @@ 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-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 @@ am__aclocal_m4_deps = $(top_srcdir)/config/kernel-ctl-table-name.m4 \
$(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 \
......
......@@ -40,11 +40,13 @@ 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-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 @@ am__aclocal_m4_deps = $(top_srcdir)/config/kernel-ctl-table-name.m4 \
$(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 \
......
......@@ -40,11 +40,13 @@ 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-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 @@ am__aclocal_m4_deps = $(top_srcdir)/config/kernel-ctl-table-name.m4 \
$(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 \
......
......@@ -27,6 +27,7 @@
#include <linux/module.h>
#include <linux/time.h>
#include <linux/ktime.h>
#include <sys/types.h>
#include <sys/timer.h>
......@@ -57,6 +58,17 @@ typedef struct timespec timespec_t;
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 @@ static inline void
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
......
......@@ -53,6 +53,7 @@ typedef struct uio {
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;
......
......@@ -33,8 +33,14 @@
#include <sys/types.h>
#include <asm/uaccess.h>
#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) + \
......
......@@ -40,11 +40,13 @@ 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-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 @@ am__aclocal_m4_deps = $(top_srcdir)/config/kernel-ctl-table-name.m4 \
$(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 \
......
......@@ -40,11 +40,13 @@ 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-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 @@ am__aclocal_m4_deps = $(top_srcdir)/config/kernel-ctl-table-name.m4 \
$(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 \
......
......@@ -48,11 +48,13 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
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 @@ am__aclocal_m4_deps = $(top_srcdir)/config/kernel-ctl-table-name.m4 \
$(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 \
......
......@@ -38,11 +38,13 @@ subdir = man
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 @@ am__aclocal_m4_deps = $(top_srcdir)/config/kernel-ctl-table-name.m4 \
$(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 \
......
......@@ -39,11 +39,13 @@ DIST_COMMON = $(dist_man_MANS) $(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 @@ am__aclocal_m4_deps = $(top_srcdir)/config/kernel-ctl-table-name.m4 \
$(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 \
......
......@@ -39,11 +39,13 @@ DIST_COMMON = $(dist_man_MANS) $(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 @@ am__aclocal_m4_deps = $(top_srcdir)/config/kernel-ctl-table-name.m4 \
$(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 \
......
......@@ -8,19 +8,19 @@ SPL_MODULE_CFLAGS += -include @abs_top_builddir@/spl_config.h
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@
......
......@@ -30,6 +30,7 @@
#include <sys/random.h>
#include <sys/thread.h>
#include <sys/vmsystm.h>
#include <sys/time.h>
#include "splat-internal.h"
#define SPLAT_KMEM_NAME "kmem"
......
......@@ -38,11 +38,13 @@ subdir = rpm
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 @@ am__aclocal_m4_deps = $(top_srcdir)/config/kernel-ctl-table-name.m4 \
$(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 \
......
......@@ -40,11 +40,13 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(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 @@ am__aclocal_m4_deps = $(top_srcdir)/config/kernel-ctl-table-name.m4 \
$(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 \
......
......@@ -171,6 +171,9 @@ chmod u+x ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/*/extra/*/*/*
rm -rf $RPM_BUILD_ROOT
%changelog
* Fri Feb 22 2019 Tony Hutter <hutter2@llnl.gov> - 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 <hutter2@llnl.gov> - 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
......
......@@ -47,6 +47,9 @@ make install DESTDIR=%{?buildroot}
%{_mandir}/man5/*
%changelog
* Fri Feb 22 2019 Tony Hutter <hutter2@llnl.gov> - 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 <hutter2@llnl.gov> - 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
......
......@@ -40,11 +40,13 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(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 \