Merge tag 'xtensa-20170202' of git://github.com/jcmvbkbc/linux-xtensa

[mirror_ubuntu-zesty-kernel.git] / fs / dlm / lock.c

diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c
index 35502d4046f573fac4909cceec1117ef033338e6..6df332296c661a688289da35e890f89696bfdccb 100644 (file)
--- a/fs/dlm/lock.c
+++ b/fs/dlm/lock.c
@@ -1395,7 +1395,6 @@ static int nodeid_warned(int nodeid, int num_nodes, int *warned)
 void dlm_scan_waiters(struct dlm_ls *ls)
 {
        struct dlm_lkb *lkb;
-       ktime_t zero = ktime_set(0, 0);
        s64 us;
        s64 debug_maxus = 0;
        u32 debug_scanned = 0;
@@ -1409,7 +1408,7 @@ void dlm_scan_waiters(struct dlm_ls *ls)
        mutex_lock(&ls->ls_waiters_mutex);
 
        list_for_each_entry(lkb, &ls->ls_waiters, lkb_wait_reply) {
-               if (ktime_equal(lkb->lkb_wait_time, zero))
+               if (!lkb->lkb_wait_time)
                        continue;
 
                debug_scanned++;
@@ -1419,7 +1418,7 @@ void dlm_scan_waiters(struct dlm_ls *ls)
                if (us < dlm_config.ci_waitwarn_us)
                        continue;
 
-               lkb->lkb_wait_time = zero;
+               lkb->lkb_wait_time = 0;
 
                debug_expired++;
                if (us > debug_maxus)