LU-6388 utils: make llog_reader parse changelogs

[fs/lustre-release.git] / lustre / include / lustre_log.h

diff --git a/lustre/include/lustre_log.h b/lustre/include/lustre_log.h
index 393ce28..c048739 100644 (file)
--- a/lustre/include/lustre_log.h
+++ b/lustre/include/lustre_log.h
@@ -15,11 +15,7 @@
  *
  * 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
  */
@@ -31,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
  *
  * lustre/include/lustre_log.h
  *
@@ -59,6 +54,7 @@
 #include <obd_class.h>
 #include <lustre/lustre_idl.h>
 #include <dt_object.h>
+#include <lustre_log_user.h>
 
 #define LOG_NAME_LIMIT(logname, name)                   \
         snprintf(logname, sizeof(logname), "LOGS/%s", name)
@@ -82,37 +78,6 @@ struct cat_handle_data {
        struct llog_handle     *chd_next_log;   /* llog to be used next */
 };
 
-static inline void logid_to_fid(struct llog_logid *id, struct lu_fid *fid)
-{
-       /* For compatibility purposes we identify pre-OSD (~< 2.3.51 MDS)
-        * logid's by non-zero ogen (inode generation) and convert them
-        * into IGIF */
-       if (id->lgl_ogen == 0) {
-               fid->f_seq = id->lgl_oi.oi.oi_seq;
-               fid->f_oid = id->lgl_oi.oi.oi_id;
-               fid->f_ver = 0;
-       } else {
-               lu_igif_build(fid, id->lgl_oi.oi.oi_id, id->lgl_ogen);
-       }
-}
-
-static inline void fid_to_logid(struct lu_fid *fid, struct llog_logid *id)
-{
-       id->lgl_oi.oi.oi_seq = fid->f_seq;
-       id->lgl_oi.oi.oi_id = fid->f_oid;
-       id->lgl_ogen = 0;
-}
-
-static inline void logid_set_id(struct llog_logid *log_id, __u64 id)
-{
-       log_id->lgl_oi.oi.oi_id = id;
-}
-
-static inline __u64 logid_id(struct llog_logid *log_id)
-{
-       return log_id->lgl_oi.oi.oi_id;
-}
-
 struct llog_handle;
 
 /* llog.c  -  general API */