X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fobdclass%2Fllog.c;h=6469578a1fdaf77b8c19009842a3fefcb2e53911;hb=9e6a0fcbf02942caff9d769d644913964d34c028;hp=4c63f6fa91a639b2db5dcf93c37c9ef7f61899a5;hpb=0cb008aa46d283c03aeae79fd3ab36c828da2174;p=fs%2Flustre-release.git

diff --git a/lustre/obdclass/llog.c b/lustre/obdclass/llog.c
index 4c63f6f..6469578 100644
--- a/lustre/obdclass/llog.c
+++ b/lustre/obdclass/llog.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -68,7 +68,7 @@ struct llog_handle *llog_alloc_handle(void)
         if (loghandle == NULL)
                 RETURN(ERR_PTR(-ENOMEM));
 
-        init_rwsem(&loghandle->lgh_lock);
+        cfs_init_rwsem(&loghandle->lgh_lock);
 
         RETURN(loghandle);
 }
@@ -83,9 +83,9 @@ void llog_free_handle(struct llog_handle *loghandle)
         if (!loghandle->lgh_hdr)
                 goto out;
         if (loghandle->lgh_hdr->llh_flags & LLOG_F_IS_PLAIN)
-                list_del_init(&loghandle->u.phd.phd_entry);
+                cfs_list_del_init(&loghandle->u.phd.phd_entry);
         if (loghandle->lgh_hdr->llh_flags & LLOG_F_IS_CAT)
-                LASSERT(list_empty(&loghandle->u.chd.chd_head));
+                LASSERT(cfs_list_empty(&loghandle->u.chd.chd_head));
         OBD_FREE(loghandle->lgh_hdr, LLOG_CHUNK_SIZE);
 
  out:
@@ -237,12 +237,13 @@ static int llog_process_thread(void *arg)
         if (!buf) {
                 lpi->lpi_rc = -ENOMEM;
 #ifdef __KERNEL__
-                complete(&lpi->lpi_completion);
+                cfs_complete(&lpi->lpi_completion);
 #endif
                 return 0;
         }
 
-        cfs_daemonize_ctxt("llog_process_thread");
+        if (!(lpi->lpi_flags & LLOG_FLAG_NODEAMON))
+                cfs_daemonize_ctxt("llog_process_thread");
 
         if (cd != NULL) {
                 last_called_index = cd->lpcd_first_idx;
@@ -323,10 +324,6 @@ static int llog_process_thread(void *arg)
                                                  lpi->lpi_cbdata);
                                 last_called_index = index;
                                 if (rc == LLOG_PROC_BREAK) {
-                                        CDEBUG(D_HA, "recovery from log: "LPX64
-                                               ":%x stopped\n",
-                                               loghandle->lgh_id.lgl_oid,
-                                               loghandle->lgh_id.lgl_ogen);
                                         GOTO(out, rc);
                                 } else if (rc == LLOG_DEL_RECORD) {
                                         llog_cancel_rec(loghandle,
@@ -353,13 +350,13 @@ static int llog_process_thread(void *arg)
                 OBD_FREE(buf, LLOG_CHUNK_SIZE);
         lpi->lpi_rc = rc;
 #ifdef __KERNEL__
-        complete(&lpi->lpi_completion);
+        cfs_complete(&lpi->lpi_completion);
 #endif
         return 0;
 }
 
-int llog_process(struct llog_handle *loghandle, llog_cb_t cb,
-                 void *data, void *catdata)
+int llog_process_flags(struct llog_handle *loghandle, llog_cb_t cb,
+                       void *data, void *catdata, int flags)
 {
         struct llog_process_info *lpi;
         int                      rc;
@@ -374,16 +371,17 @@ int llog_process(struct llog_handle *loghandle, llog_cb_t cb,
         lpi->lpi_cb        = cb;
         lpi->lpi_cbdata    = data;
         lpi->lpi_catdata   = catdata;
+        lpi->lpi_flags     = flags;
 
 #ifdef __KERNEL__
-        init_completion(&lpi->lpi_completion);
+        cfs_init_completion(&lpi->lpi_completion);
         rc = cfs_kernel_thread(llog_process_thread, lpi, CLONE_VM | CLONE_FILES);
         if (rc < 0) {
                 CERROR("cannot start thread: %d\n", rc);
                 OBD_FREE_PTR(lpi);
                 RETURN(rc);
         }
-        wait_for_completion(&lpi->lpi_completion);
+        cfs_wait_for_completion(&lpi->lpi_completion);
 #else
         llog_process_thread(lpi);
 #endif
@@ -391,6 +389,13 @@ int llog_process(struct llog_handle *loghandle, llog_cb_t cb,
         OBD_FREE_PTR(lpi);
         RETURN(rc);
 }
+EXPORT_SYMBOL(llog_process_flags);
+
+int llog_process(struct llog_handle *loghandle, llog_cb_t cb,
+                 void *data, void *catdata)
+{
+        return llog_process_flags(loghandle, cb, data, catdata, 0);
+}
 EXPORT_SYMBOL(llog_process);
 
 inline int llog_get_size(struct llog_handle *loghandle)
@@ -462,10 +467,6 @@ int llog_reverse_process(struct llog_handle *loghandle, llog_cb_t cb,
                         if (ext2_test_bit(index, llh->llh_bitmap)) {
                                 rc = cb(loghandle, rec, data);
                                 if (rc == LLOG_PROC_BREAK) {
-                                        CWARN("recovery from log: "LPX64":%x"
-                                              " stopped\n",
-                                              loghandle->lgh_id.lgl_oid,
-                                              loghandle->lgh_id.lgl_ogen);
                                         GOTO(out, rc);
                                 }
                                 if (rc)