mirror of https://github.com/archzfs/zfs-dkms
You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
88 lines
3.2 KiB
88 lines
3.2 KiB
5 years ago
|
diff --git a/include/spl/sys/time.h b/include/spl/sys/time.h
|
||
|
|
index 312415b7bc8..24c1ec7c7ae 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 f6f7bbb4b28..090ba3fbc87 100644
|
||
|
|
--- a/include/sys/vdev_impl.h
|
||
|
|
+++ b/include/sys/vdev_impl.h
|
||
|
|
@@ -274,7 +274,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;
|
||
|
|
@@ -295,7 +295,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 291f2190a28..c9f6165047d 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/vdev_initialize.c b/module/zfs/vdev_initialize.c
|
||
|
|
index 9958a295832..8a3635969e1 100644
|
||
|
|
--- a/module/zfs/vdev_initialize.c
|
||
|
|
+++ b/module/zfs/vdev_initialize.c
|
||
|
|
@@ -700,7 +700,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 5ad47cccdaf..b7548fc4c18 100644
|
||
|
|
--- a/module/zfs/vdev_trim.c
|
||
|
|
+++ b/module/zfs/vdev_trim.c
|
||
|
|
@@ -1046,7 +1046,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) {
|
||
|
|
diff --git a/module/zfs/zfs_debug.c b/module/zfs/zfs_debug.c
|
||
|
|
index 538533d27d2..cf8bbb3ce4f 100644
|
||
|
|
--- a/module/zfs/zfs_debug.c
|
||
|
|
+++ b/module/zfs/zfs_debug.c
|
||
|
|
@@ -27,7 +27,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;
|