b=19387 integrate LST into acc-sm

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

diff --git a/lustre/obdclass/llog_swab.c b/lustre/obdclass/llog_swab.c
index 4ccb6ba..41ee78a 100644 (file)
--- a/lustre/obdclass/llog_swab.c
+++ b/lustre/obdclass/llog_swab.c
@@ -138,7 +138,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_ogr);
+                __swab32s(&lur->lur_count);
                 break;
         }
 
@@ -146,7 +147,7 @@ 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_ogr);
                 __swab32s(&lsr->lsr_uid);
                 __swab32s(&lsr->lsr_gid);
                 break;
@@ -155,14 +156,23 @@ void lustre_swab_llog_rec(struct llog_rec_hdr *rec, struct llog_rec_tail *tail)
         case CHANGELOG_REC: {
                 struct llog_changelog_rec *cr = (struct llog_changelog_rec*)rec;
 
-                __swab16s(&cr->cr_flags);
-                __swab16s(&cr->cr_namelen);
-                __swab32s(&cr->cr_type);
-                __swab64s(&cr->cr_index);
-                __swab64s(&cr->cr_prev);
-                __swab64s(&cr->cr_time);
-                lustre_swab_lu_fid(&cr->cr_tfid);
-                lustre_swab_lu_fid(&cr->cr_pfid);
+                __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;
         }
 
@@ -170,7 +180,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_ogr);
                 __swab32s(&lsr->lsr_uid);
                 __swab32s(&lsr->lsr_gid);
 
@@ -205,7 +215,6 @@ void lustre_swab_llog_rec(struct llog_rec_hdr *rec, struct llog_rec_tail *tail)
                 __swab32s(&lid->lid_id.lgl_ogen);
                 break;
         }
-        case LLOG_JOIN_REC:
         case LLOG_PAD_MAGIC:
                 break;