diff options
| author | Brian Behlendorf <[email protected]> | 2020-02-26 13:18:07 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2020-02-27 09:31:02 -0800 |
| commit | 2c3a83701dd185cadb30db4556256534e2930c7d (patch) | |
| tree | ffb9108b5b62b8c7bafccfe8ed10f00f6b5881bf /module/zfs | |
| parent | ff5587d651371ab496f7962e85fe2c337fdb8a59 (diff) | |
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 <[email protected]>
Reviewed-by: Tony Hutter <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #10052
Closes #10064
Diffstat (limited to 'module/zfs')
| -rw-r--r-- | module/zfs/vdev_initialize.c | 2 | ||||
| -rw-r--r-- | module/zfs/vdev_trim.c | 2 |
2 files changed, 2 insertions, 2 deletions
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) { |