LU-7340 mdd: changelogs garbage collection

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

diff --git a/lustre/obdclass/llog_swab.c b/lustre/obdclass/llog_swab.c
index 57483da..2713e03 100644 (file)
--- a/lustre/obdclass/llog_swab.c
+++ b/lustre/obdclass/llog_swab.c
@@ -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
  */
@@ -27,7 +23,7 @@
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, 2014, Intel Corporation.
+ * Copyright (c) 2012, 2015, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -48,16 +44,16 @@
 
 static void print_llogd_body(struct llogd_body *d)
 {
-        CDEBUG(D_OTHER, "llogd body: %p\n", d);
-        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);
-        CDEBUG(D_OTHER, "\tlgd_index: %#x\n", d->lgd_index);
-        CDEBUG(D_OTHER, "\tlgd_saved_index: %#x\n", d->lgd_saved_index);
-        CDEBUG(D_OTHER, "\tlgd_len: %#x\n", d->lgd_len);
-        CDEBUG(D_OTHER, "\tlgd_cur_offset: "LPX64"\n", d->lgd_cur_offset);
+       CDEBUG(D_OTHER, "llogd body: %p\n", d);
+       CDEBUG(D_OTHER, "\tlgd_logid.lgl_oi.oi_fid: "DFID"\n",
+              PFID(&d->lgd_logid.lgl_oi.oi_fid));
+       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);
+       CDEBUG(D_OTHER, "\tlgd_index: %#x\n", d->lgd_index);
+       CDEBUG(D_OTHER, "\tlgd_saved_index: %#x\n", d->lgd_saved_index);
+       CDEBUG(D_OTHER, "\tlgd_len: %#x\n", d->lgd_len);
+       CDEBUG(D_OTHER, "\tlgd_cur_offset: %#llx\n", d->lgd_cur_offset);
 }
 
 void lustre_swab_lu_fid(struct lu_fid *fid)
@@ -218,6 +214,7 @@ void lustre_swab_llog_rec(struct llog_rec_hdr *rec)
 
                 __swab32s(&cur->cur_id);
                 __swab64s(&cur->cur_endrec);
+               __swab32s(&cur->cur_time);
                tail = &cur->cur_tail;
                 break;
         }
@@ -250,7 +247,17 @@ void lustre_swab_llog_rec(struct llog_rec_hdr *rec)
                __swab32s(&lsr->lsr_gid);
                __swab32s(&lsr->lsr_gid_h);
                __swab64s(&lsr->lsr_valid);
-               tail = &lsr->lsr_tail;
+
+               if (rec->lrh_len > sizeof(struct llog_setattr64_rec)) {
+                       struct llog_setattr64_rec_v2 *lsr2 =
+                               (struct llog_setattr64_rec_v2 *)rec;
+
+                       __swab32s(&lsr2->lsr_projid);
+                       __swab32s(&lsr2->lsr_layout_version);
+                       tail = &lsr2->lsr_tail;
+               } else {
+                       tail = &lsr->lsr_tail;
+               }
                break;
        }
        case OBD_CFG_REC:
@@ -324,7 +331,7 @@ static void print_llog_hdr(struct llog_log_hdr *h)
        CDEBUG(D_OTHER, "\tllh_hdr.lrh_index: %#x\n", h->llh_hdr.lrh_index);
        CDEBUG(D_OTHER, "\tllh_hdr.lrh_len: %#x\n", h->llh_hdr.lrh_len);
        CDEBUG(D_OTHER, "\tllh_hdr.lrh_type: %#x\n", h->llh_hdr.lrh_type);
-       CDEBUG(D_OTHER, "\tllh_timestamp: "LPX64"\n", h->llh_timestamp);
+       CDEBUG(D_OTHER, "\tllh_timestamp: %#llx\n", h->llh_timestamp);
        CDEBUG(D_OTHER, "\tllh_count: %#x\n", h->llh_count);
        CDEBUG(D_OTHER, "\tllh_bitmap_offset: %#x\n", h->llh_bitmap_offset);
        CDEBUG(D_OTHER, "\tllh_flags: %#x\n", h->llh_flags);