LU-10198 llog: keep llog handle alive until last reference

[fs/lustre-release.git] / lustre / obdclass / llog_internal.h

diff --git a/lustre/obdclass/llog_internal.h b/lustre/obdclass/llog_internal.h
index 524053b..2642529 100644 (file)
--- a/lustre/obdclass/llog_internal.h
+++ b/lustre/obdclass/llog_internal.h
@@ -15,17 +15,15 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
 /*
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, 2016, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -38,31 +36,28 @@
 #include <lustre_log.h>
 
 struct llog_process_info {
-        struct llog_handle *lpi_loghandle;
-        llog_cb_t           lpi_cb;
-        void               *lpi_cbdata;
-        void               *lpi_catdata;
-        int                 lpi_rc;
-        int                 lpi_flags;
-        cfs_completion_t    lpi_completion;
+       struct llog_handle      *lpi_loghandle;
+       llog_cb_t                lpi_cb;
+       void                    *lpi_cbdata;
+       void                    *lpi_catdata;
+       int                      lpi_rc;
+       struct completion        lpi_completion;
        const struct lu_env     *lpi_env;
-
+       struct task_struct      *lpi_reftask;
 };
 
 struct llog_thread_info {
        struct lu_attr                   lgi_attr;
        struct lu_fid                    lgi_fid;
-       struct llog_logid                lgi_logid;
        struct dt_object_format          lgi_dof;
-       struct llog_process_data         lgi_lpd;
-       struct lustre_mdt_attrs          lgi_lma_attr;
-
        struct lu_buf                    lgi_buf;
        loff_t                           lgi_off;
-
-       struct llog_rec_hdr              lgi_lrh;
-       struct llog_rec_tail             lgi_tail;
-       struct llog_logid_rec            lgi_lid;
+       struct llog_logid_rec            lgi_logid;
+       struct dt_insert_rec             lgi_dt_rec;
+       struct lu_seq_range              lgi_range;
+       struct llog_cookie               lgi_cookie;
+       struct obd_statfs                lgi_statfs;
+       char                             lgi_name[32];
 };
 
 extern struct lu_context_key llog_thread_key;
@@ -79,13 +74,22 @@ static inline struct llog_thread_info *llog_info(const struct lu_env *env)
 int llog_info_init(void);
 void llog_info_fini(void);
 
+struct llog_handle *llog_handle_get(struct llog_handle *loghandle);
+int llog_handle_put(const struct lu_env *env, struct llog_handle *loghandle);
 int llog_cat_id2handle(const struct lu_env *env, struct llog_handle *cathandle,
                       struct llog_handle **res, struct llog_logid *logid);
 int class_config_dump_handler(const struct lu_env *env,
                              struct llog_handle *handle,
                              struct llog_rec_hdr *rec, void *data);
+int class_config_yaml_output(struct llog_rec_hdr *rec, char *buf, int size);
 int llog_process_or_fork(const struct lu_env *env,
                         struct llog_handle *loghandle,
                         llog_cb_t cb, void *data, void *catdata, bool fork);
-int llog_cat_set_first_idx(struct llog_handle *cathandle, int index);
+int llog_cat_cleanup(const struct lu_env *env, struct llog_handle *cathandle,
+                    struct llog_handle *loghandle, int index);
+
+static inline struct llog_rec_hdr *llog_rec_hdr_next(struct llog_rec_hdr *rec)
+{
+       return (struct llog_rec_hdr *)((char *)rec + rec->lrh_len);
+}
 #endif