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
This commit is contained in:
parent
ff5587d651
commit
2c3a83701d
|
@ -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)
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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) {
|
||||
|
|
Loading…
Reference in New Issue