diff --git a/kmod/src/fence.c b/kmod/src/fence.c index ff617634..3669dc2d 100644 --- a/kmod/src/fence.c +++ b/kmod/src/fence.c @@ -105,12 +105,12 @@ static ssize_t elapsed_secs_show(struct kobject *kobj, { DECLARE_FENCE_FROM_KOBJ(fence, kobj); ktime_t now = ktime_get(); - struct timeval tv = { 0, }; + ktime_t t = ns_to_ktime(0); if (ktime_after(now, fence->start_kt)) - tv = ktime_to_timeval(ktime_sub(now, fence->start_kt)); + t = ktime_sub(now, fence->start_kt); - return snprintf(buf, PAGE_SIZE, "%llu", (long long)tv.tv_sec); + return snprintf(buf, PAGE_SIZE, "%llu", (long long)ktime_divns(t, NSEC_PER_SEC)); } SCOUTFS_ATTR_RO(elapsed_secs); diff --git a/kmod/src/quorum.c b/kmod/src/quorum.c index da850cc7..ede23494 100644 --- a/kmod/src/quorum.c +++ b/kmod/src/quorum.c @@ -486,7 +486,7 @@ static void set_quorum_block_event(struct super_block *sb, struct scoutfs_quorum if (WARN_ON_ONCE(event < 0 || event >= SCOUTFS_QUORUM_EVENT_NR)) return; - getnstimeofday64(&ts); + ktime_get_ts64(&ts); le64_add_cpu(&blk->write_nr, 1); ev = &blk->events[event]; diff --git a/kmod/src/server.c b/kmod/src/server.c index b49b6cd8..65b5d116 100644 --- a/kmod/src/server.c +++ b/kmod/src/server.c @@ -298,7 +298,7 @@ static void check_holder_budget(struct super_block *sb, struct server_info *serv { static bool exceeded_once = false; struct commit_hold *hold; - struct timespec ts; + struct timespec64 ts; u32 avail_used; u32 freed_used; u32 avail_now; @@ -330,7 +330,7 @@ static void check_holder_budget(struct super_block *sb, struct server_info *serv cusers->freed_before, freed_now); list_for_each_entry(hold, &cusers->holding, entry) { - ts = ktime_to_timespec(hold->start); + ts = ktime_to_timespec64(hold->start); scoutfs_err(sb, "exceeding hold start %llu.%09llu av %u fr %u", (u64)ts.tv_sec, (u64)ts.tv_nsec, hold->avail, hold->freed); hold->exceeded = true; @@ -445,7 +445,7 @@ static int server_apply_commit(struct super_block *sb, struct commit_hold *hold, { DECLARE_SERVER_INFO(sb, server); struct commit_users *cusers = &server->cusers; - struct timespec ts; + struct timespec64 ts; spin_lock(&cusers->lock); @@ -454,7 +454,7 @@ static int server_apply_commit(struct super_block *sb, struct commit_hold *hold, check_holder_budget(sb, server, cusers); if (hold->exceeded) { - ts = ktime_to_timespec(hold->start); + ts = ktime_to_timespec64(hold->start); scoutfs_err(sb, "exceeding hold start %llu.%09llu stack:", (u64)ts.tv_sec, (u64)ts.tv_nsec); dump_stack();