X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_log.h;h=fe107c7b82769fa46c6b2d084bf1b8114c61725d;hb=4724b52bba54ccdb0f81d0c63010b69e87e7f65c;hp=71bff91056e2af1562044868b9e3e0e557e27844;hpb=e1745ed18d8e28f3cf3d72df3b7ef50d83f36601;p=fs%2Flustre-release.git

diff --git a/lustre/include/lustre_log.h b/lustre/include/lustre_log.h
index 71bff91..fe107c7 100644
--- a/lustre/include/lustre_log.h
+++ b/lustre/include/lustre_log.h
@@ -106,6 +106,7 @@ int llog_backup(const struct lu_env *env, struct obd_device *obd,
 		char *name, char *backup);
 int llog_read_header(const struct lu_env *env, struct llog_handle *handle,
 		     const struct obd_uuid *uuid);
+__u64 llog_size(const struct lu_env *env, struct llog_handle *llh);
 
 /* llog_process flags */
 #define LLOG_FLAG_NODEAMON 0x0001
@@ -153,16 +154,15 @@ int llog_cat_cancel_records(const struct lu_env *env,
 			    struct llog_handle *cathandle, int count,
 			    struct llog_cookie *cookies);
 int llog_cat_process_or_fork(const struct lu_env *env,
-			     struct llog_handle *cat_llh, llog_cb_t cb,
-			     void *data, int startcat, int startidx, bool fork);
+			     struct llog_handle *cat_llh, llog_cb_t cat_cb,
+			     llog_cb_t cb, void *data, int startcat,
+			     int startidx, bool fork);
 int llog_cat_process(const struct lu_env *env, struct llog_handle *cat_llh,
 		     llog_cb_t cb, void *data, int startcat, int startidx);
+__u64 llog_cat_size(const struct lu_env *env, struct llog_handle *cat_llh);
 int llog_cat_reverse_process(const struct lu_env *env,
 			     struct llog_handle *cat_llh, llog_cb_t cb,
 			     void *data);
-int llog_cat_init_and_process(const struct lu_env *env,
-			      struct llog_handle *llh);
-
 /* llog_obd.c */
 int llog_setup(const struct lu_env *env, struct obd_device *obd,
 	       struct obd_llog_group *olg, int index,
@@ -263,7 +263,7 @@ struct llog_handle {
 	struct rw_semaphore	 lgh_lock;
 	struct mutex		 lgh_hdr_mutex; /* protect lgh_hdr data */
 	struct llog_logid	 lgh_id; /* id of this log */
-	struct llog_log_hdr	*lgh_hdr;
+	struct llog_log_hdr	*lgh_hdr; /* may be vmalloc'd */
 	size_t			lgh_hdr_size;
 	struct dt_object	*lgh_obj;
 	/* For a Catalog, is the last/newest used index for a plain slot.
@@ -275,6 +275,7 @@ struct llog_handle {
 	__u64			 lgh_cur_offset; /* used during llog_process */
 	/* used during llog_osd_write_rec */
 	__u64			 lgh_write_offset;
+	int			 lgh_max_size;
 	struct llog_ctxt	*lgh_ctxt;
 	union {
 		struct plain_handle_data	 phd;