X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Flvfs%2Fllog_cat.c;h=deadb3d2e28f97f9ba4e9459a0bffb7adb6a8557;hb=45ff8142494ba8b250c7254f45cb09f77ca3d856;hp=901a4a240bf944045ce82fa7ccacdd852dea6e44;hpb=f37aa946d055d3fa5018de6ce9a1cab5cd36f031;p=fs%2Flustre-release.git

diff --git a/lustre/lvfs/llog_cat.c b/lustre/lvfs/llog_cat.c
index 901a4a2..deadb3d 100644
--- a/lustre/lvfs/llog_cat.c
+++ b/lustre/lvfs/llog_cat.c
@@ -39,7 +39,7 @@
 #endif
 
 #include <linux/lustre_log.h>
-#include <portals/list.h>
+#include <libcfs/list.h>
 
 /* Create a new log handle and add it to the open list.
  * This log handle will be closed when all of the records in it are removed.
@@ -262,7 +262,7 @@ static struct llog_handle *llog_cat_current_log(struct llog_handle *cathandle,
                         up_write(&cathandle->lgh_lock);
                         RETURN(loghandle);
                 } else {
-                        down_write(&loghandle->lgh_lock);
+                        up_write(&loghandle->lgh_lock);
                 }
         }
 
@@ -371,7 +371,7 @@ static int llog_cat_process_cb(struct llog_handle *cat_llh,
                 CERROR("invalid record in catalog\n");
                 RETURN(-EINVAL);
         }
-        CWARN("processing log "LPX64":%x at index %u of catalog "LPX64"\n",
+        CDEBUG(D_INFO, "processing log "LPX64":%x at index %u of catalog "LPX64"\n",
                lir->lid_id.lgl_oid, lir->lid_id.lgl_ogen,
                le32_to_cpu(rec->lrh_index), cat_llh->lgh_id.lgl_oid);
 
@@ -625,8 +625,7 @@ int llog_catalog_cleanup(struct llog_ctxt *ctxt)
         cathandle = ctxt->loc_handle;
         if (cathandle)
                 llog_cat_put(ctxt->loc_handle);
- 
-//        OBD_FREE(ctxt, sizeof(*ctxt));
+
         return 0;
 }
 EXPORT_SYMBOL(llog_catalog_cleanup);