From: Thomas Gleixner Date: Wed, 16 Jul 2014 21:04:46 +0000 (+0000) Subject: fs: lockd: Use ktime_get_ns() X-Git-Tag: MMI-PSA29.97-13-9~11784^2~30 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5eaaed4fe23247f0784edc2973f04134f8180251;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git fs: lockd: Use ktime_get_ns() Replace the ever recurring: ts = ktime_get_ts(); ns = timespec_to_ns(&ts); with ns = ktime_get_ns(); Signed-off-by: Thomas Gleixner Acked-by: Trond Myklebust Cc: "J. Bruce Fields" Signed-off-by: John Stultz --- diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c index 1812f026960c..daa8e7514eae 100644 --- a/fs/lockd/mon.c +++ b/fs/lockd/mon.c @@ -306,11 +306,9 @@ static struct nsm_handle *nsm_lookup_priv(const struct nsm_private *priv) static void nsm_init_private(struct nsm_handle *nsm) { u64 *p = (u64 *)&nsm->sm_priv.data; - struct timespec ts; s64 ns; - ktime_get_ts(&ts); - ns = timespec_to_ns(&ts); + ns = ktime_get_ns(); put_unaligned(ns, p); put_unaligned((unsigned long)nsm, p + 1); }