Revert "kdbus: avoid the use of struct timespec"

This reverts commit c6c6bf55b3884bfe60db47780b96339eb7739a78.

diff --git a/ipc/kdbus/metadata.c b/ipc/kdbus/metadata.c
index 3adc6c2c2e766be8cd25684dfca3394a3e75ea54..06e0a54a276a79ca104758e2d3d3321837b796b2 100644 (file)
--- a/ipc/kdbus/metadata.c
+++ b/ipc/kdbus/metadata.c
@@ -678,8 +678,13 @@ struct kdbus_meta_conn *kdbus_meta_conn_unref(struct kdbus_meta_conn *mc)
 static void kdbus_meta_conn_collect_timestamp(struct kdbus_meta_conn *mc,
                                              struct kdbus_kmsg *kmsg)
 {
-       mc->ts.monotonic_ns = ktime_get_ns();
-       mc->ts.realtime_ns = ktime_get_real_ns();
+       struct timespec ts;
+
+       ktime_get_ts(&ts);
+       mc->ts.monotonic_ns = timespec_to_ns(&ts);
+
+       ktime_get_real_ts(&ts);
+       mc->ts.realtime_ns = timespec_to_ns(&ts);
 
        if (kmsg)
                mc->ts.seqnum = kmsg->seq;

diff --git a/ipc/kdbus/reply.c b/ipc/kdbus/reply.c
index 008dca801627edd2351be459cac63ba853d14d86..6b3bd81bbb4d99f4c27f8a1ccd686296d906df95 100644 (file)
--- a/ipc/kdbus/reply.c
+++ b/ipc/kdbus/reply.c
@@ -204,9 +204,11 @@ void kdbus_reply_list_scan_work(struct work_struct *work)
                container_of(work, struct kdbus_conn, work.work);
        struct kdbus_reply *reply, *reply_tmp;
        u64 deadline = ~0ULL;
+       struct timespec64 ts;
        u64 now;
 
-       now = ktime_get_ns();
+       ktime_get_ts64(&ts);
+       now = timespec64_to_ns(&ts);
 
        mutex_lock(&conn->lock);
        if (!kdbus_conn_active(conn)) {