Branch b1_4

Minor message cleanups.

diff --git a/lustre/ldlm/ldlm_lib.c b/lustre/ldlm/ldlm_lib.c
index e602282..b7c06ed 100644 (file)
--- a/lustre/ldlm/ldlm_lib.c
+++ b/lustre/ldlm/ldlm_lib.c
@@ -503,7 +503,7 @@ int target_handle_reconnect(struct lustre_handle *conn, struct obd_export *exp,
                 hdl = &exp->exp_imp_reverse->imp_remote_handle;
                 /* Might be a re-connect after a partition. */
                 if (!memcmp(&conn->cookie, &hdl->cookie, sizeof conn->cookie)) {
-                        CERROR("%s reconnecting\n", cluuid->uuid);
+                        CWARN("%s reconnecting\n", cluuid->uuid);
                         conn->cookie = exp->exp_handle.h_cookie;
                         /* target_handle_connect() treats EALREADY and
                          * -EALREADY differently */
@@ -545,12 +545,12 @@ int target_handle_connect(struct ptlrpc_request *req, svc_handler_t handler)
         int size = sizeof(*data);
         ENTRY;
 
-        OBD_RACE(OBD_FAIL_TGT_CONN_RACE); 
+        OBD_RACE(OBD_FAIL_TGT_CONN_RACE);
 
         LASSERT_REQSWAB (req, 0);
         str = lustre_msg_string(req->rq_reqmsg, 0, sizeof(tgtuuid) - 1);
         if (str == NULL) {
-                DEBUG_REQ(D_ERROR, req, "bad target UUID for connect\n");
+                DEBUG_REQ(D_ERROR, req, "bad target UUID for connect");
                 GOTO(out, rc = -EINVAL);
         }
 
@@ -562,16 +562,16 @@ int target_handle_connect(struct ptlrpc_request *req, svc_handler_t handler)
 
         if (!target || target->obd_stopping || !target->obd_set_up) {
                 DEBUG_REQ(D_ERROR, req, "UUID '%s' is not available "
-                       " for connect (%s)\n", str,
-                       !target ? "no target" : 
-                       (target->obd_stopping ? "stopping" : "not set up"));
+                          " for connect (%s)", str,
+                          !target ? "no target" :
+                          (target->obd_stopping ? "stopping" : "not set up"));
                 GOTO(out, rc = -ENODEV);
         }
 
         LASSERT_REQSWAB (req, 1);
         str = lustre_msg_string(req->rq_reqmsg, 1, sizeof(cluuid) - 1);
         if (str == NULL) {
-                DEBUG_REQ(D_ERROR, req, "bad client UUID for connect\n");
+                DEBUG_REQ(D_ERROR, req, "bad client UUID for connect");
                 GOTO(out, rc = -EINVAL);
         }
 
@@ -1254,7 +1254,7 @@ target_send_reply_msg (struct ptlrpc_request *req, int rc, int fail_id)
         } else {
                 DEBUG_REQ(D_NET, req, "sending reply");
         }
-        
+
         return (ptlrpc_send_reply(req, 1));
 }
 
@@ -1271,7 +1271,7 @@ target_send_reply(struct ptlrpc_request *req, int rc, int fail_id)
 
         sni = req->rq_rqbd->rqbd_srv_ni;
         svc = sni->sni_service;
-        
+
         rs = req->rq_reply_state;
         if (rs == NULL || !rs->rs_difficult) {
                 /* no notifiers */
@@ -1360,8 +1360,7 @@ void target_committed_to_req(struct ptlrpc_request *req)
         if (!obd->obd_no_transno && req->rq_repmsg != NULL)
                 req->rq_repmsg->last_committed = obd->obd_last_committed;
         else
-                DEBUG_REQ(D_IOCTL, req,
-                          "not sending last_committed update");
+                DEBUG_REQ(D_IOCTL, req, "not sending last_committed update");
 
         CDEBUG(D_INFO, "last_committed "LPU64", xid "LPU64"\n",
                obd->obd_last_committed, req->rq_xid);

diff --git a/lustre/ldlm/ldlm_lock.c b/lustre/ldlm/ldlm_lock.c
index 52cfbb8..cda70ee 100644 (file)
--- a/lustre/ldlm/ldlm_lock.c
+++ b/lustre/ldlm/ldlm_lock.c
@@ -170,7 +170,7 @@ void ldlm_lock_remove_from_lru(struct ldlm_lock *lock)
         EXIT;
 }
 
-/* This used to have a 'strict' flact, which recovery would use to mark an
+/* This used to have a 'strict' flag, which recovery would use to mark an
  * in-use lock as needing-to-die.  Lest I am ever tempted to put it back, I
  * shall explain why it's gone: with the new hash table scheme, once you call
  * ldlm_lock_destroy, you can never drop your final references on this lock.