From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755877AbbDJLno (ORCPT ); Fri, 10 Apr 2015 07:43:44 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:64529 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753355AbbDJLnn (ORCPT ); Fri, 10 Apr 2015 07:43:43 -0400 From: Arnd Bergmann To: Greg Kroah-Hartman Cc: Daniel Mack , David Herrmann , Djalal Harouni , linux-kernel@vger.kernel.org Subject: kdbus: avoid the use of struct timespec Date: Fri, 10 Apr 2015 13:43:37 +0200 Message-ID: <7770444.Orjuxv4CFX@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:JthM/bUFje89bJkzl9lrnDlw1CQcFZLnbTgQ3/v9hKWBr/ei/ct GhJltRUbcpaGsjW5Rsmuhs5fLCAJ4DZJhAs0UIcpe4XZw/48MbC6WNPhhNJNrYVGZ6cPUod Vit2FhfCXJa0gaj2f0yXyVVvoeOxtZUNxAM5jVruuPprNkGhDKO2A7ml9Q/GoSUkDbJmztj 2pUOTLTtPKJ9OWYiGsEtA== X-UI-Out-Filterresults: notjunk:1; Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Signed-off-by: Arnd Bergmann diff --git a/ipc/kdbus/metadata.c b/ipc/kdbus/metadata.c index 06e0a54a276a..3adc6c2c2e76 100644 --- a/ipc/kdbus/metadata.c +++ b/ipc/kdbus/metadata.c @@ -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; diff --git a/ipc/kdbus/reply.c b/ipc/kdbus/reply.c index 6b3bd81bbb4d..008dca801627 100644 --- a/ipc/kdbus/reply.c +++ b/ipc/kdbus/reply.c @@ -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)) {