LU-3302 llog: Do not use ostid swab for llogid

[fs/lustre-release.git] / lustre / obdclass / llog_swab.c

diff --git a/lustre/obdclass/llog_swab.c b/lustre/obdclass/llog_swab.c
index ddb64e5..10c6225 100644 (file)
--- a/lustre/obdclass/llog_swab.c
+++ b/lustre/obdclass/llog_swab.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -51,8 +51,8 @@
 static void print_llogd_body(struct llogd_body *d)
 {
         CDEBUG(D_OTHER, "llogd body: %p\n", d);
-        CDEBUG(D_OTHER, "\tlgd_logid.lgl_oid: "LPX64"\n", d->lgd_logid.lgl_oid);
-        CDEBUG(D_OTHER, "\tlgd_logid.lgl_oseq: "LPX64"\n", d->lgd_logid.lgl_oseq);
+        CDEBUG(D_OTHER, "\tlgd_logid.lgl_oi: "DOSTID"\n",
+              POSTID(&d->lgd_logid.lgl_oi));
         CDEBUG(D_OTHER, "\tlgd_logid.lgl_ogen: %#x\n", d->lgd_logid.lgl_ogen);
         CDEBUG(D_OTHER, "\tlgd_ctxt_idx: %#x\n", d->lgd_ctxt_idx);
         CDEBUG(D_OTHER, "\tlgd_llh_flags: %#x\n", d->lgd_llh_flags);
@@ -62,13 +62,38 @@ static void print_llogd_body(struct llogd_body *d)
         CDEBUG(D_OTHER, "\tlgd_cur_offset: "LPX64"\n", d->lgd_cur_offset);
 }
 
+void lustre_swab_lu_fid(struct lu_fid *fid)
+{
+        __swab64s (&fid->f_seq);
+        __swab32s (&fid->f_oid);
+        __swab32s (&fid->f_ver);
+}
+EXPORT_SYMBOL(lustre_swab_lu_fid);
+
+void lustre_swab_ost_id(struct ost_id *oid)
+{
+       if (fid_seq_is_mdt0(oid->oi.oi_seq)) {
+               __swab64s(&oid->oi.oi_id);
+               __swab64s(&oid->oi.oi_seq);
+       } else {
+               lustre_swab_lu_fid(&oid->oi_fid);
+       }
+}
+EXPORT_SYMBOL(lustre_swab_ost_id);
+
+void lustre_swab_llog_id(struct llog_logid *log_id)
+{ 
+       __swab64s(&log_id->lgl_oi.oi.oi_id);
+       __swab64s(&log_id->lgl_oi.oi.oi_seq);
+        __swab32s(&log_id->lgl_ogen);
+}
+EXPORT_SYMBOL(lustre_swab_llog_id);
+
 void lustre_swab_llogd_body (struct llogd_body *d)
 {
         ENTRY;
         print_llogd_body(d);
-        __swab64s (&d->lgd_logid.lgl_oid);
-        __swab64s (&d->lgd_logid.lgl_oseq);
-        __swab32s (&d->lgd_logid.lgl_ogen);
+       lustre_swab_llog_id(&d->lgd_logid);
         __swab32s (&d->lgd_ctxt_idx);
         __swab32s (&d->lgd_llh_flags);
         __swab32s (&d->lgd_index);
@@ -84,9 +109,7 @@ void lustre_swab_llogd_conn_body (struct llogd_conn_body *d)
 {
         __swab64s (&d->lgdc_gen.mnt_cnt);
         __swab64s (&d->lgdc_gen.conn_cnt);
-        __swab64s (&d->lgdc_logid.lgl_oid);
-        __swab64s (&d->lgdc_logid.lgl_oseq);
-        __swab32s (&d->lgdc_logid.lgl_ogen);
+       lustre_swab_llog_id(&d->lgdc_logid);
         __swab32s (&d->lgdc_ctxt_idx);
 }
 EXPORT_SYMBOL(lustre_swab_llogd_conn_body);
@@ -99,14 +122,6 @@ void lustre_swab_ll_fid(struct ll_fid *fid)
 }
 EXPORT_SYMBOL(lustre_swab_ll_fid);
 
-void lustre_swab_lu_fid(struct lu_fid *fid)
-{
-        __swab64s (&fid->f_seq);
-        __swab32s (&fid->f_oid);
-        __swab32s (&fid->f_ver);
-}
-EXPORT_SYMBOL(lustre_swab_lu_fid);
-
 void lustre_swab_lu_seq_range(struct lu_seq_range *range)
 {
         __swab64s (&range->lsr_start);
@@ -196,8 +211,7 @@ void lustre_swab_llog_rec(struct llog_rec_hdr *rec)
                struct llog_setattr64_rec *lsr =
                        (struct llog_setattr64_rec *)rec;
 
-               __swab64s(&lsr->lsr_oid);
-               __swab64s(&lsr->lsr_oseq);
+               lustre_swab_ost_id(&lsr->lsr_oi);
                __swab32s(&lsr->lsr_uid);
                __swab32s(&lsr->lsr_uid_h);
                __swab32s(&lsr->lsr_gid);
@@ -223,14 +237,12 @@ void lustre_swab_llog_rec(struct llog_rec_hdr *rec)
         }
        case LLOG_LOGID_MAGIC:
        {
-                struct llog_logid_rec *lid = (struct llog_logid_rec *)rec;
+               struct llog_logid_rec *lid = (struct llog_logid_rec *)rec;
 
-                __swab64s(&lid->lid_id.lgl_oid);
-                __swab64s(&lid->lid_id.lgl_oseq);
-                __swab32s(&lid->lid_id.lgl_ogen);
+               lustre_swab_llog_id(&lid->lid_id);
                tail = &lid->lid_tail;
-                break;
-        }
+               break;
+       }
        case LLOG_GEN_REC:
        {
                struct llog_gen_rec *lgr = (struct llog_gen_rec *)rec;