LU-589 auster: Export 'CONFIG' environment variable.

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

diff --git a/lustre/obdclass/llog_swab.c b/lustre/obdclass/llog_swab.c
index 366dc19..57483da 100644 (file)
--- a/lustre/obdclass/llog_swab.c
+++ b/lustre/obdclass/llog_swab.c
@@ -252,23 +252,23 @@ void lustre_swab_llog_rec(struct llog_rec_hdr *rec)
                __swab64s(&lsr->lsr_valid);
                tail = &lsr->lsr_tail;
                break;
-        }
-        case OBD_CFG_REC:
-                /* these are swabbed as they are consumed */
-                break;
+       }
+       case OBD_CFG_REC:
+               /* these are swabbed as they are consumed */
+               break;
        case LLOG_HDR_MAGIC:
        {
-                struct llog_log_hdr *llh = (struct llog_log_hdr *)rec;
-
-                __swab64s(&llh->llh_timestamp);
-                __swab32s(&llh->llh_count);
-                __swab32s(&llh->llh_bitmap_offset);
-                __swab32s(&llh->llh_flags);
-                __swab32s(&llh->llh_size);
-                __swab32s(&llh->llh_cat_idx);
-               tail = &llh->llh_tail;
-                break;
-        }
+               struct llog_log_hdr *llh = (struct llog_log_hdr *)rec;
+
+               __swab64s(&llh->llh_timestamp);
+               __swab32s(&llh->llh_count);
+               __swab32s(&llh->llh_bitmap_offset);
+               __swab32s(&llh->llh_flags);
+               __swab32s(&llh->llh_size);
+               __swab32s(&llh->llh_cat_idx);
+               tail = LLOG_HDR_TAIL(llh);
+               break;
+       }
        case LLOG_LOGID_MAGIC:
        {
                struct llog_logid_rec *lid = (struct llog_logid_rec *)rec;
@@ -320,18 +320,20 @@ void lustre_swab_llog_rec(struct llog_rec_hdr *rec)
 
 static void print_llog_hdr(struct llog_log_hdr *h)
 {
-        CDEBUG(D_OTHER, "llog header: %p\n", 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_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);
-        CDEBUG(D_OTHER, "\tllh_size: %#x\n", h->llh_size);
-        CDEBUG(D_OTHER, "\tllh_cat_idx: %#x\n", h->llh_cat_idx);
-        CDEBUG(D_OTHER, "\tllh_tail.lrt_index: %#x\n", h->llh_tail.lrt_index);
-        CDEBUG(D_OTHER, "\tllh_tail.lrt_len: %#x\n", h->llh_tail.lrt_len);
+       CDEBUG(D_OTHER, "llog header: %p\n", 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_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);
+       CDEBUG(D_OTHER, "\tllh_size: %#x\n", h->llh_size);
+       CDEBUG(D_OTHER, "\tllh_cat_idx: %#x\n", h->llh_cat_idx);
+       CDEBUG(D_OTHER, "\tllh_tail.lrt_index: %#x\n",
+              LLOG_HDR_TAIL(h)->lrt_index);
+       CDEBUG(D_OTHER, "\tllh_tail.lrt_len: %#x\n",
+              LLOG_HDR_TAIL(h)->lrt_len);
 }
 
 void lustre_swab_llog_hdr (struct llog_log_hdr *h)