From 01b01f5e2348518648d490d33e2ffec7ab647b85 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 4 Nov 2018 03:46:14 +0000 Subject: [PATCH] Merge r7417 from trunk git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@7673 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/src/scst_targ.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/scst/src/scst_targ.c b/scst/src/scst_targ.c index 34d8b0828..6d637e765 100644 --- a/scst/src/scst_targ.c +++ b/scst/src/scst_targ.c @@ -5822,17 +5822,9 @@ again: #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0) if (scst_poll_ns > 0) { - struct timespec ts; ktime_t end, kt; - int rc; - rc = __getnstimeofday(&ts); - if (unlikely(rc != 0)) { - WARN_ON_ONCE(rc); - goto go; - } - - end = timespec_to_ktime(ts); + end = ktime_get(); end = ktime_add_ns(end, scst_poll_ns); do { @@ -5843,16 +5835,9 @@ again: goto again; } cpu_relax(); - rc = __getnstimeofday(&ts); - if (unlikely(rc != 0)) { - WARN_ON_ONCE(rc); - goto go; - } - kt = timespec_to_ktime(ts); + kt = ktime_get(); } while (ktime_before(kt, end)); } - -go: #endif spin_lock_irq(&p_cmd_threads->cmd_list_lock); spin_lock(&thr->thr_cmd_list_lock);