current branches now use lnet from HEAD

[fs/lustre-release.git] / lustre / include / linux / lustre_commit_confd.h

diff --git a/lustre/include/linux/lustre_commit_confd.h b/lustre/include/linux/lustre_commit_confd.h
index a749911..94f72b3 100644 (file)
--- a/lustre/include/linux/lustre_commit_confd.h
+++ b/lustre/include/linux/lustre_commit_confd.h
@@ -28,10 +28,9 @@
 
 struct llog_canceld_ctxt {
         struct list_head           llcd_list;  /* free or pending struct list */
-        struct obd_import         *llcd_import;
+        struct llog_ctxt          *llcd_ctxt;
         struct llog_commit_master *llcd_lcm;
         int                        llcd_tries; /* number of tries to send */
-        struct llog_ctxt_gen       llcd_gen; 
         int                        llcd_cookiebytes;
         struct llog_cookie         llcd_cookies[0];
 };
@@ -68,6 +67,7 @@ struct llog_commit_daemon {
 
 /* ptlrpc/recov_thread.c */
 int llog_start_commit_thread(void);
+int llog_cleanup_commit_master(int force);
 struct llog_canceld_ctxt *llcd_grab(void);
 void llcd_send(struct llog_canceld_ctxt *llcd);