use special macro for print time_t, cleanup in includes.

[fs/lustre-release.git] / lustre / ldlm / ldlm_lockd.c

diff --git a/lustre/ldlm/ldlm_lockd.c b/lustre/ldlm/ldlm_lockd.c
index 36a1c80..f345503 100644 (file)
--- a/lustre/ldlm/ldlm_lockd.c
+++ b/lustre/ldlm/ldlm_lockd.c
@@ -679,7 +679,7 @@ int ldlm_server_completion_ast(struct ldlm_lock *lock, int flags, void *data)
                                              &lock->l_enqueued_time, NULL);
 
         if (total_enqueue_wait / 1000000 > obd_timeout)
                                              &lock->l_enqueued_time, NULL);
 
         if (total_enqueue_wait / 1000000 > obd_timeout)

-                LDLM_ERROR(lock, "enqueue wait took %luus from %lu",
+                LDLM_ERROR(lock, "enqueue wait took %luus from "CFS_TIME_T,

                            total_enqueue_wait, lock->l_enqueued_time.tv_sec);
 
          req = ptlrpc_request_alloc(lock->l_export->exp_imp_reverse,
                            total_enqueue_wait, lock->l_enqueued_time.tv_sec);
 
          req = ptlrpc_request_alloc(lock->l_export->exp_imp_reverse,