Branch HEAD

 b=20302
 i=johann
----------------------------------------------------------------------
 Modified Files:
 	lustre/ChangeLog lustre/ptlrpc/client.c
---------------------------------------------------------------------
Description: Fix in ptlrpc_expire_one_request() to print the signed time
	     difference.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index d2fb8b8..3e583bd 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -14,6 +14,11 @@ tbd  Sun Microsystems, Inc.
         removed cwd "./" (refer to Bugzilla 14399).
        * File join has been disabled in this release, refer to Bugzilla 16929.
 
+Severity   : normal
+Bugzilla   : 20302
+Description: Fix in ptlrpc_expire_one_request() to print the signed time
+            difference.
+
 Severity   : enhancement
 Bugzilla   : 16312
 Description: Build kernels (RHEL5, OEL5 and SLES10/11) using the vendor's own

diff --git a/lustre/ptlrpc/client.c b/lustre/ptlrpc/client.c
index 20b575e..73864f3 100644 (file)
--- a/lustre/ptlrpc/client.c
+++ b/lustre/ptlrpc/client.c
@@ -1520,8 +1520,9 @@ int ptlrpc_expire_one_request(struct ptlrpc_request *req, int async_unlink)
         req->rq_timedout = 1;
         spin_unlock(&req->rq_lock);
 
-        DEBUG_REQ(D_WARNING, req, "Request x"LPU64" sent from %s to NID %s "
-                  CFS_DURATION_T"s ago has %s (limit "CFS_DURATION_T"s).\n",
+        DEBUG_REQ(req->rq_fake ? D_INFO : D_WARNING, req, 
+                  "Request x"LPU64" sent from %s to NID %s "CFS_DURATION_T"s "
+                  "ago has %s ("CFS_DURATION_T"s prior to deadline).\n",
                   req->rq_xid, imp ? imp->imp_obd->obd_name : "<?>",
                   imp ? libcfs_nid2str(imp->imp_connection->c_peer.nid) : "<?>",
                   cfs_time_sub(cfs_time_current_sec(), req->rq_sent),