X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fldlm%2Fldlm_request.c;h=5011d59de3a41b9da80257d86c5300bec6c20c1f;hp=b54e767cca64194fc3bd42783d3dacdb2fd692b4;hb=6fc61eea18e7fb48734ffef8aee4faa283f05e36;hpb=9c302674d8e7f65219b6c4e6d5c0a27d44f2c458

diff --git a/lustre/ldlm/ldlm_request.c b/lustre/ldlm/ldlm_request.c
index b54e767..5011d59 100644
--- a/lustre/ldlm/ldlm_request.c
+++ b/lustre/ldlm/ldlm_request.c
@@ -81,8 +81,8 @@ int ldlm_expired_completion_wait(void *data)
 			   CFS_DURATION_T"s ago); not entering recovery in "
                            "server code, just going back to sleep",
 			   lock->l_enqueued_time.tv_sec,
-                           cfs_time_current_sec() -
-                           lock->l_enqueued_time.tv_sec);
+                           cfs_time_sub(cfs_time_current_sec(),
+                           lock->l_enqueued_time.tv_sec));
                 if (cfs_time_after(cfs_time_current(), next_dump)) {
                         last_dump = next_dump;
                         next_dump = cfs_time_shift(300);
@@ -100,7 +100,8 @@ int ldlm_expired_completion_wait(void *data)
         LDLM_ERROR(lock, "lock timed out (enqueued at "CFS_TIME_T", "
                   CFS_DURATION_T"s ago), entering recovery for %s@%s",
                   lock->l_enqueued_time.tv_sec,
-                  cfs_time_current_sec() - lock->l_enqueued_time.tv_sec,
+                  cfs_time_sub(cfs_time_current_sec(),
+                  lock->l_enqueued_time.tv_sec),
                   obd2cli_tgt(obd), imp->imp_connection->c_remote_uuid.uuid);
 
         RETURN(0);
@@ -206,8 +207,10 @@ noreproc:
                 RETURN(rc);
         }
 
-        LDLM_DEBUG(lock, "client-side enqueue waking up: granted after %lds",
-                   cfs_time_current_sec() - lock->l_enqueued_time.tv_sec);
+        LDLM_DEBUG(lock, "client-side enqueue waking up: granted after "
+                   CFS_DURATION_T"s",
+                   cfs_time_sub(cfs_time_current_sec(),
+                   lock->l_enqueued_time.tv_sec));
 
         /* Update our time estimate */
         at_add(&lock->l_resource->lr_namespace->ns_at_estimate,