Update b_orphan from HEAD (20040130_1601)

diff --git a/lustre/obdclass/llog_cat.c b/lustre/obdclass/llog_cat.c
index a962797..d09cad1 100644 (file)
--- a/lustre/obdclass/llog_cat.c
+++ b/lustre/obdclass/llog_cat.c
@@ -87,9 +87,9 @@ static struct llog_handle *llog_cat_new_log(struct llog_handle *cathandle)
         if (rc)
                 GOTO(out_destroy, rc);
 
-        CWARN("new recovery log "LPX64":%x for index %u of catalog "LPX64"\n",
-               loghandle->lgh_id.lgl_oid, loghandle->lgh_id.lgl_ogen, index,
-               cathandle->lgh_id.lgl_oid);
+        CDEBUG(D_HA, "new recovery log "LPX64":%x for index %u of catalog "
+               LPX64"\n", loghandle->lgh_id.lgl_oid, loghandle->lgh_id.lgl_ogen,
+               index, cathandle->lgh_id.lgl_oid);
         /* build the record for this log in the catalog */
         rec.lid_hdr.lrh_len = cpu_to_le32(sizeof(rec));
         rec.lid_hdr.lrh_index = cpu_to_le32(index);

diff --git a/lustre/obdclass/llog_obd.c b/lustre/obdclass/llog_obd.c
index ea68bb3..d01441a 100644 (file)
--- a/lustre/obdclass/llog_obd.c
+++ b/lustre/obdclass/llog_obd.c
@@ -249,9 +249,9 @@ int llog_obd_origin_cleanup(struct llog_ctxt *ctxt)
                                 llog_cat_set_first_idx(cathandle, index);
                                 rc = llog_cancel_rec(cathandle, index);
                                 if (rc == 0)
-                                        CWARN("cancel plain log at index %u "
-                                              "of catalog "LPX64"\n",
-                                              index, cathandle->lgh_id.lgl_oid);
+                                        CDEBUG(D_HA, "cancel plain log at index"
+                                               " %u of catalog "LPX64"\n",
+                                               index,cathandle->lgh_id.lgl_oid);
                         }
                 }
                 llog_cat_put(ctxt->loc_handle);
@@ -260,7 +260,6 @@ int llog_obd_origin_cleanup(struct llog_ctxt *ctxt)
 }
 EXPORT_SYMBOL(llog_obd_origin_cleanup);
 
-
 /* add for obdfilter/sz and mds/unlink */
 int llog_obd_origin_add(struct llog_ctxt *ctxt,
                         struct llog_rec_hdr *rec, struct lov_stripe_md *lsm,