kdbus: avoid the use of struct timespec
I did a routine check for new users of 'timespec', which we are trying to remove from the kernel in order to survive y2038. kdbus came up and looks particularly trivial to clean up.
This changes the three ktime_get_ts() variants used in kdbus to ktime_get_ns(), which aside from removing timespec also simplifies the code and makes it slightly more efficient by avoiding a two-way conversion.
ipc/kdbus/metadata.c +2 -7
@@ -678,13 +678,8 @@ 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) { -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); + mc->ts.monotonic_ns =ktime_get_ns (); + mc->ts.realtime_ns =ktime_get_real_ns ();if (kmsg) mc->ts.seqnum = kmsg->seq;
ipc/kdbus/reply.c +1 -3
@@ -204,11 +204,9 @@ 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; -ktime_get_ts64 (&ts); - now =timespec64_to_ns (&ts); + now =ktime_get_ns ();mutex_lock (&conn->lock);if (!kdbus_conn_active (conn)) {
Greg Kroah-Hartman
AppliedQuoted 9 lines · Arnd Bergmann
I did a routine check for new users of 'timespec', which we are trying to remove from the kernel in order to survive y2038. kdbus came up and looks particularly trivial to clean up.
This changes the three
ktime_get_ts()variants used in kdbus toktime_get_ns(), which aside from removing timespec also simplifies the code and makes it slightly more efficient by avoiding a two-way conversion.Signed-off-by Arnd Bergmann <[email protected]>
Applied, thanks.
greg k-h