diff options
author | CyberLeo <cyberleo@cyberleo.net> | 2020-03-28 05:06:25 -0500 |
---|---|---|
committer | CyberLeo <cyberleo@cyberleo.net> | 2020-03-28 05:46:30 -0500 |
commit | 2bcfdd65af6623d67e1865abc9636d7958ec4190 (patch) | |
tree | 1475e8b92fae5d212fb46e690ac819537f58c0dd /user/zfs/Linux-5.6-compat-time_t-2c3a83701dd1.patch | |
parent | 9297468fa579836e3a6a381b798feb6b78217c2d (diff) | |
download | packages-2bcfdd65af6623d67e1865abc9636d7958ec4190.tar.gz packages-2bcfdd65af6623d67e1865abc9636d7958ec4190.tar.bz2 packages-2bcfdd65af6623d67e1865abc9636d7958ec4190.tar.xz packages-2bcfdd65af6623d67e1865abc9636d7958ec4190.zip |
user/zfs, user/zfs-utils: update to 0.8.3 and make it build
Update autoconf to remove nonstandard '&>' redirection that causes
module build test to inadvertently background in dash and then fail due
to a race.
Also backport patches to support removal of time_t; commit hashes
courtesy of https://bugs.launchpad.net/bugs/1863136 .
Diffstat (limited to 'user/zfs/Linux-5.6-compat-time_t-2c3a83701dd1.patch')
-rw-r--r-- | user/zfs/Linux-5.6-compat-time_t-2c3a83701dd1.patch | 110 |
1 files changed, 110 insertions, 0 deletions
diff --git a/user/zfs/Linux-5.6-compat-time_t-2c3a83701dd1.patch b/user/zfs/Linux-5.6-compat-time_t-2c3a83701dd1.patch new file mode 100644 index 000000000..7a97d968f --- /dev/null +++ b/user/zfs/Linux-5.6-compat-time_t-2c3a83701dd1.patch @@ -0,0 +1,110 @@ +commit 2c3a83701dd185cadb30db4556256534e2930c7d +Author: Brian Behlendorf <behlendorf1@llnl.gov> +Date: Wed Feb 26 13:18:07 2020 -0800 + + Linux 5.6 compat: time_t + + As part of the Linux kernel's y2038 changes the time_t type has been + fully retired. Callers are now required to use the time64_t type. + + Rather than move to the new type, I've removed the few remaining + places where a time_t is used in the kernel code. They've been + replaced with a uint64_t which is already how ZFS internally + handled these values. + + Going forward we should work towards updating the remaining user + space time_t consumers to the 64-bit interfaces. + + Reviewed-by: Matthew Macy <mmacy@freebsd.org> + Reviewed-by: Tony Hutter <hutter2@llnl.gov> + Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> + Closes #10052 + Closes #10064 + +diff --git a/include/spl/sys/time.h b/include/spl/sys/time.h +index 56fd725c0..4309c300b 100644 +--- a/include/spl/sys/time.h ++++ b/include/spl/sys/time.h +@@ -85,7 +85,7 @@ gethrestime(inode_timespec_t *ts) + #endif + } + +-static inline time_t ++static inline uint64_t + gethrestime_sec(void) + { + #if defined(HAVE_INODE_TIMESPEC64_TIMES) +diff --git a/include/sys/vdev_impl.h b/include/sys/vdev_impl.h +index 4f63e1ae5..b55871a5d 100644 +--- a/include/sys/vdev_impl.h ++++ b/include/sys/vdev_impl.h +@@ -272,7 +272,7 @@ struct vdev { + range_tree_t *vdev_initialize_tree; /* valid while initializing */ + uint64_t vdev_initialize_bytes_est; + uint64_t vdev_initialize_bytes_done; +- time_t vdev_initialize_action_time; /* start and end time */ ++ uint64_t vdev_initialize_action_time; /* start and end time */ + + /* TRIM related */ + boolean_t vdev_trim_exit_wanted; +@@ -293,7 +293,7 @@ struct vdev { + uint64_t vdev_trim_rate; /* requested rate (bytes/sec) */ + uint64_t vdev_trim_partial; /* requested partial TRIM */ + uint64_t vdev_trim_secure; /* requested secure TRIM */ +- time_t vdev_trim_action_time; /* start and end time */ ++ uint64_t vdev_trim_action_time; /* start and end time */ + + /* for limiting outstanding I/Os (initialize and TRIM) */ + kmutex_t vdev_initialize_io_lock; +diff --git a/lib/libspl/include/sys/time.h b/lib/libspl/include/sys/time.h +index 291f2190a..c9f616504 100644 +--- a/lib/libspl/include/sys/time.h ++++ b/lib/libspl/include/sys/time.h +@@ -88,7 +88,7 @@ gethrestime(inode_timespec_t *ts) + ts->tv_nsec = tv.tv_usec * NSEC_PER_USEC; + } + +-static inline time_t ++static inline uint64_t + gethrestime_sec(void) + { + struct timeval tv; +diff --git a/module/zfs/zfs_debug.c b/module/zfs/zfs_debug.c +index a64971d0a..d98463f1b 100644 +--- a/module/zfs/zfs_debug.c ++++ b/module/zfs/zfs_debug.c +@@ -28,7 +28,7 @@ + + typedef struct zfs_dbgmsg { + procfs_list_node_t zdm_node; +- time_t zdm_timestamp; ++ uint64_t zdm_timestamp; + int zdm_size; + char zdm_msg[1]; /* variable length allocation */ + } zfs_dbgmsg_t; +diff --git a/module/zfs/vdev_initialize.c b/module/zfs/vdev_initialize.c +index 3e691c7f5..5899af9fc 100644 +--- a/module/zfs/vdev_initialize.c ++++ b/module/zfs/vdev_initialize.c +@@ -713,7 +713,7 @@ vdev_initialize_restart(vdev_t *vd) + vd->vdev_leaf_zap, VDEV_LEAF_ZAP_INITIALIZE_ACTION_TIME, + sizeof (timestamp), 1, ×tamp); + ASSERT(err == 0 || err == ENOENT); +- vd->vdev_initialize_action_time = (time_t)timestamp; ++ vd->vdev_initialize_action_time = timestamp; + + if (vd->vdev_initialize_state == VDEV_INITIALIZE_SUSPENDED || + vd->vdev_offline) { +diff --git a/module/zfs/vdev_trim.c b/module/zfs/vdev_trim.c +index c7c429cbd..7dec07e3c 100644 +--- a/module/zfs/vdev_trim.c ++++ b/module/zfs/vdev_trim.c +@@ -1051,7 +1051,7 @@ vdev_trim_restart(vdev_t *vd) + vd->vdev_leaf_zap, VDEV_LEAF_ZAP_TRIM_ACTION_TIME, + sizeof (timestamp), 1, ×tamp); + ASSERT(err == 0 || err == ENOENT); +- vd->vdev_trim_action_time = (time_t)timestamp; ++ vd->vdev_trim_action_time = timestamp; + + if (vd->vdev_trim_state == VDEV_TRIM_SUSPENDED || + vd->vdev_offline) { |