X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fobdclass%2Fllog_swab.c;h=18ebd2944d93c465c5ea4d2c9a225230f336119c;hb=8ca651d636c37339cc50bffa4532b7cbd0ead570;hp=b76cca8a342fa1fa591c175dddf7f7c8423ca356;hpb=4201416b775b14d6e4cd89b7c68bb1c1bc950144;p=fs%2Flustre-release.git

diff --git a/lustre/obdclass/llog_swab.c b/lustre/obdclass/llog_swab.c
index b76cca8..18ebd29 100644
--- a/lustre/obdclass/llog_swab.c
+++ b/lustre/obdclass/llog_swab.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -52,7 +52,7 @@ 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_ogr: "LPX64"\n", d->lgd_logid.lgl_ogr);
+        CDEBUG(D_OTHER, "\tlgd_logid.lgl_oseq: "LPX64"\n", d->lgd_logid.lgl_oseq);
         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);
@@ -67,7 +67,7 @@ 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_ogr);
+        __swab64s (&d->lgd_logid.lgl_oseq);
         __swab32s (&d->lgd_logid.lgl_ogen);
         __swab32s (&d->lgd_ctxt_idx);
         __swab32s (&d->lgd_llh_flags);
@@ -85,7 +85,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_ogr);
+        __swab64s (&d->lgdc_logid.lgl_oseq);
         __swab32s (&d->lgdc_logid.lgl_ogen);
         __swab32s (&d->lgdc_ctxt_idx);
 }
@@ -111,7 +111,8 @@ void lustre_swab_lu_seq_range(struct lu_seq_range *range)
 {
         __swab64s (&range->lsr_start);
         __swab64s (&range->lsr_end);
-        __swab32s (&range->lsr_mdt);
+        __swab32s (&range->lsr_index);
+        __swab32s (&range->lsr_flags);
 }
 EXPORT_SYMBOL(lustre_swab_lu_seq_range);
 
@@ -128,7 +129,6 @@ void lustre_swab_llog_rec(struct llog_rec_hdr *rec, struct llog_rec_tail *tail)
 
                 lustre_swab_ll_fid(&lsc->lsc_fid);
                 __swab32s(&lsc->lsc_ioepoch);
-
                 break;
         }
 
@@ -139,8 +139,8 @@ void lustre_swab_llog_rec(struct llog_rec_hdr *rec, struct llog_rec_tail *tail)
                 struct llog_unlink_rec *lur = (struct llog_unlink_rec *)rec;
 
                 __swab64s(&lur->lur_oid);
-                __swab32s(&lur->lur_ogen);
-
+                __swab32s(&lur->lur_oseq);
+                __swab32s(&lur->lur_count);
                 break;
         }
 
@@ -148,10 +148,32 @@ void lustre_swab_llog_rec(struct llog_rec_hdr *rec, struct llog_rec_tail *tail)
                 struct llog_setattr_rec *lsr = (struct llog_setattr_rec *)rec;
 
                 __swab64s(&lsr->lsr_oid);
-                __swab32s(&lsr->lsr_ogen);
+                __swab32s(&lsr->lsr_oseq);
                 __swab32s(&lsr->lsr_uid);
                 __swab32s(&lsr->lsr_gid);
+                break;
+        }
 
+        case CHANGELOG_REC: {
+                struct llog_changelog_rec *cr = (struct llog_changelog_rec*)rec;
+
+                __swab16s(&cr->cr.cr_namelen);
+                __swab16s(&cr->cr.cr_flags);
+                __swab32s(&cr->cr.cr_type);
+                __swab64s(&cr->cr.cr_index);
+                __swab64s(&cr->cr.cr_prev);
+                __swab64s(&cr->cr.cr_time);
+                lustre_swab_lu_fid(&cr->cr.cr_tfid);
+                lustre_swab_lu_fid(&cr->cr.cr_pfid);
+                break;
+        }
+
+        case CHANGELOG_USER_REC: {
+                struct llog_changelog_user_rec *cur =
+                        (struct llog_changelog_user_rec*)rec;
+
+                __swab32s(&cur->cur_id);
+                __swab64s(&cur->cur_endrec);
                 break;
         }
 
@@ -159,7 +181,7 @@ void lustre_swab_llog_rec(struct llog_rec_hdr *rec, struct llog_rec_tail *tail)
                 struct llog_setattr64_rec *lsr = (struct llog_setattr64_rec *)rec;
 
                 __swab64s(&lsr->lsr_oid);
-                __swab32s(&lsr->lsr_ogen);
+                __swab32s(&lsr->lsr_oseq);
                 __swab32s(&lsr->lsr_uid);
                 __swab32s(&lsr->lsr_gid);
 
@@ -167,7 +189,6 @@ void lustre_swab_llog_rec(struct llog_rec_hdr *rec, struct llog_rec_tail *tail)
         }
 
         case OBD_CFG_REC:
-        case PTL_CFG_REC:                       /* obsolete */
                 /* these are swabbed as they are consumed */
                 break;
 
@@ -184,7 +205,6 @@ void lustre_swab_llog_rec(struct llog_rec_hdr *rec, struct llog_rec_tail *tail)
                         __swab32s(&llh->llh_tail.lrt_index);
                         __swab32s(&llh->llh_tail.lrt_len);
                 }
-
                 break;
         }
 
@@ -192,14 +212,11 @@ void lustre_swab_llog_rec(struct llog_rec_hdr *rec, struct llog_rec_tail *tail)
                 struct llog_logid_rec *lid = (struct llog_logid_rec *)rec;
 
                 __swab64s(&lid->lid_id.lgl_oid);
-                __swab64s(&lid->lid_id.lgl_ogr);
+                __swab64s(&lid->lid_id.lgl_oseq);
                 __swab32s(&lid->lid_id.lgl_ogen);
                 break;
         }
-        case LLOG_JOIN_REC:
         case LLOG_PAD_MAGIC:
-        /* ignore old pad records of type 0 */
-        case 0:
                 break;
 
         default: