From e60c1452a702b099dc4b7ab0cefaf4ab93499542 Mon Sep 17 00:00:00 2001
From: bobijam <bobijam>
Date: Fri, 6 Mar 2009 02:32:40 +0000
Subject: [PATCH] Branch b1_6 b=17682 i=johann i=vitaly.fertman (vitaly)

Improve debug info for OSS.
---
 lustre/include/obd.h     |  4 ++--
 lustre/ost/ost_handler.c | 16 ++++++++++------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/lustre/include/obd.h b/lustre/include/obd.h
index bfd6348..e7ce881 100644
--- a/lustre/include/obd.h
+++ b/lustre/include/obd.h
@@ -1213,9 +1213,9 @@ static inline void obd_transno_commit_cb(struct obd_device *obd, __u64 transno,
                        obd->obd_name, transno, error);
                 return;
         }
-        CDEBUG(D_HA, "%s: transno "LPU64" committed\n",
-               obd->obd_name, transno);
         if (transno > obd->obd_last_committed) {
+                CDEBUG(D_INFO, "%s: transno "LPU64" committed\n",
+                       obd->obd_name, transno);
                 obd->obd_last_committed = transno;
                 ptlrpc_commit_replies (obd);
         }
diff --git a/lustre/ost/ost_handler.c b/lustre/ost/ost_handler.c
index ab74c8d..0cd3a25 100644
--- a/lustre/ost/ost_handler.c
+++ b/lustre/ost/ost_handler.c
@@ -641,6 +641,10 @@ static int ost_prolong_locks_iter(struct ldlm_lock *lock, void *data)
                 return LDLM_ITER_CONTINUE;
         }
 
+        CDEBUG(D_DLMTRACE,"refresh lock: "LPU64"/"LPU64" ("LPU64"->"LPU64")\n",
+               lock->l_resource->lr_name.name[0],
+               lock->l_resource->lr_name.name[1],
+               opd->opd_policy.l_extent.start, opd->opd_policy.l_extent.end);
         /* OK. this is a possible lock the user holds doing I/O
          * let's refresh eviction timer for it */
         ldlm_refresh_waiting_lock(lock, opd->opd_timeout);
@@ -671,7 +675,7 @@ static int ost_rw_prolong_locks(struct ptlrpc_request *req, struct obd_ioobj *ob
                           max(at_est2timeout(at_get(&req->rq_rqbd->
                               rqbd_service->srv_at_estimate)), ldlm_timeout);
 
-        CDEBUG(D_DLMTRACE,"refresh locks: "LPU64"/"LPU64" ("LPU64"->"LPU64")\n",
+        CDEBUG(D_INFO,"refresh locks: "LPU64"/"LPU64" ("LPU64"->"LPU64")\n",
                res_id.name[0], res_id.name[1], opd.opd_policy.l_extent.start,
                opd.opd_policy.l_extent.end);
 
@@ -1297,7 +1301,7 @@ static int ost_set_info(struct obd_export *exp, struct ptlrpc_request *req)
         if (KEY_IS(KEY_GRANT_SHRINK)) {
                 rc = lustre_pack_reply(req, 2, size, NULL);
                 if (rc)
-                        RETURN(rc); 
+                        RETURN(rc);
         } else {
                 rc = lustre_pack_reply(req, 1, NULL, NULL);
                 if (rc)
@@ -1306,19 +1310,19 @@ static int ost_set_info(struct obd_export *exp, struct ptlrpc_request *req)
 
         vallen = lustre_msg_buflen(req->rq_reqmsg, REQ_REC_OFF + 1);
         if (vallen) {
-                if (KEY_IS(KEY_GRANT_SHRINK)) { 
-                        body = lustre_swab_reqbuf(req, REQ_REC_OFF + 1, 
+                if (KEY_IS(KEY_GRANT_SHRINK)) {
+                        body = lustre_swab_reqbuf(req, REQ_REC_OFF + 1,
                                                   sizeof(*body),
                                                   lustre_swab_ost_body);
                         if (!body)
                                 RETURN(-EFAULT);
 
-                        repbody = lustre_msg_buf(req->rq_repmsg, 
+                        repbody = lustre_msg_buf(req->rq_repmsg,
                                                  REPLY_REC_OFF,
                                                  sizeof(*repbody));
                         memcpy(repbody, body, sizeof(*body));
                         val = (char*)repbody;
-                } else 
+                } else
                         val = lustre_msg_buf(req->rq_reqmsg, REQ_REC_OFF + 1,0);
         }
 
-- 
1.8.3.1