Whamcloud - gitweb
LU-16000 utils: align updatelog parameters in llog_reader
[fs/lustre-release.git] / lustre / utils / llog_reader.c
index c5922c1..dc2ef05 100644 (file)
  *
  * 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
  */
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2015, Intel Corporation.
+ * Copyright (c) 2011, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
  */
 /** \defgroup llog_reader Lustre Log Reader
  *
 #include <limits.h>
 #include <stdbool.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/param.h>
 #ifdef HAVE_ENDIAN_H
 # include <endian.h>
 #endif
 #include <linux/magic.h>
 #include <errno.h>
 #include <time.h>
-#include <lnet/nidstr.h>
-#include <lustre/lustre_idl.h>
+#include <linux/lnet/nidstr.h>
+#include <linux/lustre/lustre_cfg.h>
+#include <linux/lustre/lustre_fid.h>
+#include <linux/lustre/lustre_ostid.h>
+#include <linux/lustre/lustre_log_user.h>
 #include <lustre/lustreapi.h>
-#include <lustre_log_user.h>
-#include <lustre_cfg.h>
 
 static inline int ext2_test_bit(int nr, const void *addr)
 {
 #if __BYTE_ORDER == __BIG_ENDIAN
        const unsigned char *tmp = addr;
+
        return (tmp[nr >> 3] >> (nr & 7)) & 1;
 #else
        const unsigned long *tmp = addr;
+
        return ((1UL << (nr & (__WORDSIZE - 1))) &
                ((tmp)[nr / __WORDSIZE])) != 0;
 #endif
 }
 
 int llog_pack_buffer(int fd, struct llog_log_hdr **llog_buf,
-                     struct llog_rec_hdr ***recs, int *recs_number);
+                    struct llog_rec_hdr ***recs, int *recs_number);
 
 void print_llog_header(struct llog_log_hdr *llog_buf);
 static void print_records(struct llog_rec_hdr **recs_buf,
                          int rec_number, int is_ext);
 void llog_unpack_buffer(int fd, struct llog_log_hdr *llog_buf,
-                        struct llog_rec_hdr **recs_buf);
+                       struct llog_rec_hdr **recs_buf);
 
 #define CANCELLED 0x678
 
 #define PTL_CMD_BASE 100
-char* portals_command[17]=
-{
-        "REGISTER_PEER_FD",
-        "CLOSE_CONNECTION",
-        "REGISTER_MYNID",
-        "PUSH_CONNECTION",
-        "GET_CONN",
-        "DEL_PEER",
-        "ADD_PEER",
-        "GET_PEER",
-        "GET_TXDESC",
-        "ADD_ROUTE",
-        "DEL_ROUTE",
-        "GET_ROUTE",
-        "NOTIFY_ROUTER",
-        "ADD_INTERFACE",
-        "DEL_INTERFACE",
-        "GET_INTERFACE",
-        ""
+char *portals_command[17] = {
+       "REGISTER_PEER_FD",
+       "CLOSE_CONNECTION",
+       "REGISTER_MYNID",
+       "PUSH_CONNECTION",
+       "GET_CONN",
+       "DEL_PEER",
+       "ADD_PEER",
+       "GET_PEER",
+       "GET_TXDESC",
+       "ADD_ROUTE",
+       "DEL_ROUTE",
+       "GET_ROUTE",
+       "NOTIFY_ROUTER",
+       "ADD_INTERFACE",
+       "DEL_INTERFACE",
+       "GET_INTERFACE",
+       ""
 };
 
 int is_fstype_ext(int fd)
 {
-       struct statfs           st;
-       int                     rc;
+       struct statfs st;
+       int rc;
 
        rc = fstatfs(fd, &st);
        if (rc < 0) {
@@ -121,7 +120,6 @@ int is_fstype_ext(int fd)
        return (st.f_type == EXT4_SUPER_MAGIC);
 }
 
-
 /**
  * Attempt to display a path to the object (file) containing changelog entries,
  * referred to by this changelog_catalog record.
@@ -139,9 +137,8 @@ int is_fstype_ext(int fd)
 #define OSD_OI_FID_NR         (1UL << 7)
 static void print_log_path(struct llog_logid_rec *lid, int is_ext)
 {
-
-       char                    object_path[255];
-       struct lu_fid           fid_from_logid;
+       char object_path[255];
+       struct lu_fid fid_from_logid;
 
        logid_to_fid(&lid->lid_id, &fid_from_logid);
 
@@ -153,12 +150,13 @@ static void print_log_path(struct llog_logid_rec *lid, int is_ext)
        else
                snprintf(object_path, sizeof(object_path),
                         "oi.%ju/"DFID_NOBRACE,
-                        (uintmax_t)(fid_from_logid.f_seq & (OSD_OI_FID_NR - 1)),
+                        (uintmax_t)(fid_from_logid.f_seq &
+                                    (OSD_OI_FID_NR - 1)),
                         PFID(&fid_from_logid));
 
-       printf("ogen=%X id="DOSTID" path=%s\n",
-               lid->lid_id.lgl_ogen, POSTID(&lid->lid_id.lgl_oi),
-               object_path);
+       printf("id="DFID":%x path=%s\n",
+              PFID(&lid->lid_id.lgl_oi.oi_fid), lid->lid_id.lgl_ogen,
+              object_path);
 }
 
 int main(int argc, char **argv)
@@ -187,7 +185,8 @@ int main(int argc, char **argv)
        is_ext = is_fstype_ext(fd);
        if (is_ext < 0) {
                rc = is_ext;
-               printf("Unable to determine type of filesystem containing %s\n",
+               llapi_error(LLAPI_MSG_ERROR, -rc,
+                           "Unable to determine filesystem type for %s",
                       argv[1]);
                goto out_fd;
        }
@@ -198,8 +197,10 @@ int main(int argc, char **argv)
                goto out_fd;
        }
 
-       print_llog_header(llog_buf);
-       print_records(recs_buf, rec_number, is_ext);
+       if (llog_buf)
+               print_llog_header(llog_buf);
+       if (recs_buf)
+               print_records(recs_buf, rec_number, is_ext);
        llog_unpack_buffer(fd, llog_buf, recs_buf);
 
 out_fd:
@@ -208,8 +209,6 @@ out:
        return rc;
 }
 
-
-
 int llog_pack_buffer(int fd, struct llog_log_hdr **llog,
                     struct llog_rec_hdr ***recs,
                     int *recs_number)
@@ -220,7 +219,8 @@ int llog_pack_buffer(int fd, struct llog_log_hdr **llog,
        char *file_buf = NULL, *recs_buf = NULL;
        struct llog_rec_hdr **recs_pr = NULL;
        char *ptr = NULL;
-       int i;
+       int count;
+       int i, last_idx;
 
        rc = fstat(fd, &st);
        if (rc < 0) {
@@ -232,15 +232,14 @@ int llog_pack_buffer(int fd, struct llog_log_hdr **llog,
        file_size = st.st_size;
        if (file_size < sizeof(**llog)) {
                llapi_error(LLAPI_MSG_ERROR, rc,
-                           "File too small for llog header: "
-                           "need %zd, size %lld\n",
+                           "File too small for llog header: want=%zd got=%lld",
                            sizeof(**llog), file_size);
                rc = -EIO;
                goto out;
        }
 
        file_buf = malloc(file_size);
-       if (file_buf == NULL) {
+       if (!file_buf) {
                rc = -ENOMEM;
                llapi_error(LLAPI_MSG_ERROR, rc, "Memory Alloc for file_buf.");
                goto out;
@@ -261,11 +260,24 @@ int llog_pack_buffer(int fd, struct llog_log_hdr **llog,
                goto clear_file_buf;
        }
 
+       count = __le32_to_cpu((*llog)->llh_count);
+       if (count < 0) {
+               rc = -EINVAL;
+               llapi_error(LLAPI_MSG_ERROR, rc,
+                           "corrupted llog: negative record number %d",
+                           count);
+               goto clear_file_buf;
+       } else if (count == 0) {
+               llapi_printf(LLAPI_MSG_NORMAL,
+                            "uninitialized llog: zero record number\n");
+               *recs_number = 0;
+               goto clear_file_buf;
+       }
        /* the llog header not countable here.*/
-       recs_num = le32_to_cpu((*llog)->llh_count) - 1;
+       recs_num = count - 1;
 
-       recs_buf = malloc(recs_num * sizeof(**recs_pr));
-       if (recs_buf == NULL) {
+       recs_buf = calloc(recs_num, sizeof(**recs_pr));
+       if (!recs_buf) {
                rc = -ENOMEM;
                llapi_error(LLAPI_MSG_ERROR, rc,
                            "Error allocating %zd bytes for recs_buf",
@@ -274,9 +286,10 @@ int llog_pack_buffer(int fd, struct llog_log_hdr **llog,
        }
        recs_pr = (struct llog_rec_hdr **)recs_buf;
 
-       ptr = file_buf + le32_to_cpu((*llog)->llh_hdr.lrh_len);
+       ptr = file_buf + __le32_to_cpu((*llog)->llh_hdr.lrh_len);
        i = 0;
 
+       last_idx = 0;
        while (ptr < (file_buf + file_size)) {
                struct llog_rec_hdr *cur_rec;
                int idx;
@@ -290,7 +303,7 @@ int llog_pack_buffer(int fd, struct llog_log_hdr **llog,
                }
 
                cur_rec = (struct llog_rec_hdr *)ptr;
-               idx = le32_to_cpu(cur_rec->lrh_index);
+               idx = __le32_to_cpu(cur_rec->lrh_index);
                recs_pr[i] = cur_rec;
                offset = (unsigned long)ptr - (unsigned long)file_buf;
                if (cur_rec->lrh_len == 0 ||
@@ -304,13 +317,22 @@ int llog_pack_buffer(int fd, struct llog_log_hdr **llog,
                        printf("rec #%d type=%x len=%u offset %lu\n", idx,
                               cur_rec->lrh_type, cur_rec->lrh_len, offset);
                } else {
-                       printf("Bit %d of %d not set\n", idx, recs_num);
                        cur_rec->lrh_id = CANCELLED;
+                       if (cur_rec->lrh_type == LLOG_PAD_MAGIC &&
+                          ((offset + cur_rec->lrh_len) & 0x7) != 0)
+                               printf("rec #%d wrong padding len=%u offset %lu to 0x%lx\n",
+                                      idx, cur_rec->lrh_len, offset,
+                                      offset + cur_rec->lrh_len);
                        /* The header counts only set records */
                        i--;
                }
+               if (last_idx + 1 != idx) {
+                       printf("Previous index is %d, current %d, offset %lu\n",
+                              last_idx, idx, offset);
+               }
+               last_idx = idx;
 
-               ptr += le32_to_cpu(cur_rec->lrh_len);
+               ptr += __le32_to_cpu(cur_rec->lrh_len);
                if ((ptr - file_buf) > file_size) {
                        printf("The log is corrupt (too big at %d)\n", i);
                        rc = -EINVAL;
@@ -336,165 +358,200 @@ clear_file_buf:
 }
 
 void llog_unpack_buffer(int fd, struct llog_log_hdr *llog_buf,
-                        struct llog_rec_hdr **recs_buf)
+                       struct llog_rec_hdr **recs_buf)
 {
-        free(llog_buf);
-        free(recs_buf);
-        return;
+       if (llog_buf)
+               free(llog_buf);
+       if (recs_buf)
+               free(recs_buf);
 }
 
 void print_llog_header(struct llog_log_hdr *llog_buf)
 {
-        time_t t;
+       time_t t;
+       unsigned int lrh_len = __le32_to_cpu(llog_buf->llh_hdr.lrh_len);
+       struct llog_rec_tail *tail = ((struct llog_rec_tail *)((char *)llog_buf+
+                                lrh_len - sizeof(llog_buf->llh_tail)));
 
-        printf("Header size : %u\n",
-               le32_to_cpu(llog_buf->llh_hdr.lrh_len));
+       printf("Header size : %u\t llh_size : %u\n", lrh_len,
+              __le32_to_cpu(llog_buf->llh_size));
 
-        t = le64_to_cpu(llog_buf->llh_timestamp);
-        printf("Time : %s", ctime(&t));
+       t = __le64_to_cpu(llog_buf->llh_timestamp);
+       printf("Time : %s", ctime(&t));
 
-        printf("Number of records: %u\n",
-               le32_to_cpu(llog_buf->llh_count)-1);
+       printf("Number of records: %u\tcat_idx: %u\tlast_idx: %u\n",
+              __le32_to_cpu(llog_buf->llh_count)-1,
+              __le32_to_cpu(llog_buf->llh_cat_idx),
+              __le32_to_cpu(tail->lrt_index));
 
-        printf("Target uuid : %s \n",
-               (char *)(&llog_buf->llh_tgtuuid));
+       printf("Target uuid : %s\n",
+              (char *)(&llog_buf->llh_tgtuuid));
 
-        /* Add the other info you want to view here */
+       /* Add the other info you want to view here */
 
-        printf("-----------------------\n");
-        return;
+       printf("-----------------------\n");
 }
 
 static void print_1_cfg(struct lustre_cfg *lcfg)
 {
-        int i;
+       int i;
 
-        if (lcfg->lcfg_nid)
+       if (lcfg->lcfg_nid)
                printf("nid=%s(%#jx)  ", libcfs_nid2str(lcfg->lcfg_nid),
                       (uintmax_t)lcfg->lcfg_nid);
-        if (lcfg->lcfg_nal)
-                printf("nal=%d ", lcfg->lcfg_nal);
-        for (i = 0; i <  lcfg->lcfg_bufcount; i++)
-                printf("%d:%.*s  ", i, lcfg->lcfg_buflens[i],
-                       (char*)lustre_cfg_buf(lcfg, i));
-        return;
+       if (lcfg->lcfg_nal)
+               printf("nal=%d ", lcfg->lcfg_nal);
+       for (i = 0; i <  lcfg->lcfg_bufcount; i++)
+               printf("%d:%.*s  ", i, lcfg->lcfg_buflens[i],
+                      (char *)lustre_cfg_buf(lcfg, i));
 }
 
+static char *lustre_cfg_string(struct lustre_cfg *lcfg, __u32 index)
+{
+       char *s;
+
+       if (lcfg->lcfg_buflens[index] == 0)
+               return NULL;
+
+       s = lustre_cfg_buf(lcfg, index);
+       if (!s)
+               return NULL;
+
+       /*
+        * make sure it's NULL terminated, even if this kills a char
+        * of data. Try to use the padding first though.
+        */
+       if (s[lcfg->lcfg_buflens[index] - 1] != '\0') {
+               size_t last = __ALIGN_KERNEL(lcfg->lcfg_buflens[index], 8) - 1;
+               char lost;
+
+               /* Use the smaller value */
+               if (last > lcfg->lcfg_buflens[index])
+                       last = lcfg->lcfg_buflens[index];
+
+               lost = s[last];
+               s[last] = '\0';
+               if (lost != '\0') {
+                       fprintf(stderr,
+                               "Truncated buf %d to '%s' (lost '%c'...)\n",
+                               index, s, lost);
+               }
+       }
+       return s;
+}
 
 static void print_setup_cfg(struct lustre_cfg *lcfg)
 {
-        struct lov_desc *desc;
-
-        if ((lcfg->lcfg_bufcount == 2) &&
-            (lcfg->lcfg_buflens[1] == sizeof(*desc))) {
-                printf("lov_setup ");
-                printf("0:%s  ", lustre_cfg_string(lcfg, 0));
-                printf("1:(struct lov_desc)\n");
-                desc = (struct lov_desc*)(lustre_cfg_string(lcfg, 1));
-                printf("\t\tuuid=%s  ", (char*)desc->ld_uuid.uuid);
-                printf("stripe:cnt=%u ", desc->ld_default_stripe_count);
+       struct lov_desc *desc;
+
+       if ((lcfg->lcfg_bufcount == 2) &&
+           (lcfg->lcfg_buflens[1] == sizeof(*desc))) {
+               printf("lov_setup ");
+               printf("0:%s  ", lustre_cfg_string(lcfg, 0));
+               printf("1:(struct lov_desc)\n");
+               desc = (struct lov_desc *)(lustre_cfg_string(lcfg, 1));
+               printf("\t\tuuid=%s  ", (char *)desc->ld_uuid.uuid);
+               printf("stripe:cnt=%u ", desc->ld_default_stripe_count);
                printf("size=%ju ", (uintmax_t)desc->ld_default_stripe_size);
                printf("offset=%ju ",
                       (uintmax_t)desc->ld_default_stripe_offset);
-                printf("pattern=%#x", desc->ld_pattern);
-        } else {
-                printf("setup     ");
-                print_1_cfg(lcfg);
-        }
-
-        return;
+               printf("pattern=%#x", desc->ld_pattern);
+       } else {
+               printf("setup     ");
+               print_1_cfg(lcfg);
+       }
 }
 
 void print_lustre_cfg(struct lustre_cfg *lcfg, int *skip)
 {
-        enum lcfg_command_type cmd = le32_to_cpu(lcfg->lcfg_command);
-
-        if (*skip > 0)
-                printf("SKIP ");
-
-        switch(cmd){
-        case(LCFG_ATTACH):{
-                printf("attach    ");
-                print_1_cfg(lcfg);
-                break;
-        }
-        case(LCFG_SETUP):{
-                print_setup_cfg(lcfg);
-                break;
-        }
-        case(LCFG_DETACH):{
-                printf("detach    ");
-                print_1_cfg(lcfg);
-                break;
-        }
-        case(LCFG_CLEANUP):{
-                printf("cleanup   ");
-                print_1_cfg(lcfg);
-                break;
-        }
-        case(LCFG_ADD_UUID):{
-                printf("add_uuid  ");
-                print_1_cfg(lcfg);
-                break;
-        }
-        case(LCFG_DEL_UUID):{
-                printf("del_uuid  ");
-                print_1_cfg(lcfg);
-                break;
-        }
-        case(LCFG_ADD_CONN):{
-                printf("add_conn  ");
-                print_1_cfg(lcfg);
-                break;
-        }
-        case(LCFG_DEL_CONN):{
-                printf("del_conn  ");
-                print_1_cfg(lcfg);
-                break;
-        }
-        case(LCFG_LOV_ADD_OBD):{
-                printf("lov_modify_tgts add ");
-                print_1_cfg(lcfg);
-                break;
-        }
-        case(LCFG_LOV_DEL_OBD):{
-                printf("lov_modify_tgts del ");
-                print_1_cfg(lcfg);
-                break;
-        }
-        case(LCFG_ADD_MDC):{
-                printf("modify_mdc_tgts add ");
-                print_1_cfg(lcfg);
-                break;
-        }
-        case(LCFG_DEL_MDC):{
-                printf("modify_mdc_tgts del ");
-                print_1_cfg(lcfg);
-                break;
-        }
-        case(LCFG_MOUNTOPT):{
-                printf("mount_option ");
-                print_1_cfg(lcfg);
-                break;
-        }
-        case(LCFG_DEL_MOUNTOPT):{
-                printf("del_mount_option ");
-                print_1_cfg(lcfg);
-                break;
-        }
-        case(LCFG_SET_TIMEOUT):{
-                printf("set_timeout=%d ", lcfg->lcfg_num);
-                break;
-        }
-        case(LCFG_SET_LDLM_TIMEOUT):{
-                printf("set_ldlm_timeout=%d ", lcfg->lcfg_num);
-                break;
-        }
-        case(LCFG_SET_UPCALL):{
-                printf("set_lustre_upcall ");
-                print_1_cfg(lcfg);
-                break;
-        }
+       enum lcfg_command_type cmd = __le32_to_cpu(lcfg->lcfg_command);
+
+       if (*skip > 0)
+               printf("SKIP ");
+
+       switch (cmd) {
+       case(LCFG_ATTACH):{
+               printf("attach    ");
+               print_1_cfg(lcfg);
+               break;
+       }
+       case(LCFG_SETUP):{
+               print_setup_cfg(lcfg);
+               break;
+       }
+       case(LCFG_DETACH):{
+               printf("detach    ");
+               print_1_cfg(lcfg);
+               break;
+       }
+       case(LCFG_CLEANUP):{
+               printf("cleanup   ");
+               print_1_cfg(lcfg);
+               break;
+       }
+       case(LCFG_ADD_UUID):{
+               printf("add_uuid  ");
+               print_1_cfg(lcfg);
+               break;
+       }
+       case(LCFG_DEL_UUID):{
+               printf("del_uuid  ");
+               print_1_cfg(lcfg);
+               break;
+       }
+       case(LCFG_ADD_CONN):{
+               printf("add_conn  ");
+               print_1_cfg(lcfg);
+               break;
+       }
+       case(LCFG_DEL_CONN):{
+               printf("del_conn  ");
+               print_1_cfg(lcfg);
+               break;
+       }
+       case(LCFG_LOV_ADD_OBD):{
+               printf("lov_modify_tgts add ");
+               print_1_cfg(lcfg);
+               break;
+       }
+       case(LCFG_LOV_DEL_OBD):{
+               printf("lov_modify_tgts del ");
+               print_1_cfg(lcfg);
+               break;
+       }
+       case(LCFG_ADD_MDC):{
+               printf("modify_mdc_tgts add ");
+               print_1_cfg(lcfg);
+               break;
+       }
+       case(LCFG_DEL_MDC):{
+               printf("modify_mdc_tgts del ");
+               print_1_cfg(lcfg);
+               break;
+       }
+       case(LCFG_MOUNTOPT):{
+               printf("mount_option ");
+               print_1_cfg(lcfg);
+               break;
+       }
+       case(LCFG_DEL_MOUNTOPT):{
+               printf("del_mount_option ");
+               print_1_cfg(lcfg);
+               break;
+       }
+       case(LCFG_SET_TIMEOUT):{
+               printf("set_timeout=%d ", lcfg->lcfg_num);
+               break;
+       }
+       case(LCFG_SET_LDLM_TIMEOUT):{
+               printf("set_ldlm_timeout=%d ", lcfg->lcfg_num);
+               break;
+       }
+       case(LCFG_SET_UPCALL):{
+               printf("set_lustre_upcall ");
+               print_1_cfg(lcfg);
+               break;
+       }
        case(LCFG_PARAM):{
                printf("param ");
                print_1_cfg(lcfg);
@@ -505,22 +562,22 @@ void print_lustre_cfg(struct lustre_cfg *lcfg, int *skip)
                print_1_cfg(lcfg);
                break;
        }
-        case(LCFG_SPTLRPC_CONF):{
-                printf("sptlrpc_conf ");
-                print_1_cfg(lcfg);
-                break;
-        }
-        case(LCFG_MARKER):{
-                struct cfg_marker *marker = lustre_cfg_buf(lcfg, 1);
-                char createtime[26], canceltime[26] = "";
-                time_t time_tmp;
+       case(LCFG_SPTLRPC_CONF):{
+               printf("sptlrpc_conf ");
+               print_1_cfg(lcfg);
+               break;
+       }
+       case(LCFG_MARKER):{
+               struct cfg_marker *marker = lustre_cfg_buf(lcfg, 1);
+               char createtime[26], canceltime[26] = "";
+               time_t time_tmp;
 
                if (marker->cm_flags & CM_START &&
                    marker->cm_flags & CM_SKIP) {
                        printf("SKIP START ");
                        (*skip)++;
                } else if (marker->cm_flags & CM_END) {
-                       printf(     "END   ");
+                       printf("END   ");
                        *skip = 0;
                }
 
@@ -531,106 +588,383 @@ void print_lustre_cfg(struct lustre_cfg *lcfg, int *skip)
                                printf("EXCLUDE END   ");
                }
 
-                /* Handle overflow of 32-bit time_t gracefully.
-                 * The copy to time_tmp is needed in any case to
-                 * keep the pointer happy, even on 64-bit systems. */
-                time_tmp = marker->cm_createtime;
-                if (time_tmp == marker->cm_createtime) {
-                        ctime_r(&time_tmp, createtime);
-                        createtime[strlen(createtime) - 1] = 0;
-                } else {
-                        strcpy(createtime, "in the distant future");
-                }
-
-                if (marker->cm_canceltime) {
-                        /* Like cm_createtime, we try to handle overflow of
-                         * 32-bit time_t gracefully. The copy to time_tmp
-                         * is also needed on 64-bit systems to keep the
-                         * pointer happy, see bug 16771 */
-                        time_tmp = marker->cm_canceltime;
-                        if (time_tmp == marker->cm_canceltime) {
-                                ctime_r(&time_tmp, canceltime);
-                                canceltime[strlen(canceltime) - 1] = 0;
-                        } else {
-                                strcpy(canceltime, "in the distant future");
-                        }
-                }
-
-                printf("marker %3d (flags=%#04x, v%d.%d.%d.%d) %-15s '%s' %s-%s",
-                       marker->cm_step, marker->cm_flags,
-                       OBD_OCD_VERSION_MAJOR(marker->cm_vers),
-                       OBD_OCD_VERSION_MINOR(marker->cm_vers),
-                       OBD_OCD_VERSION_PATCH(marker->cm_vers),
-                       OBD_OCD_VERSION_FIX(marker->cm_vers),
-                       marker->cm_tgtname, marker->cm_comment,
-                       createtime, canceltime);
-                break;
-        }
-        case(LCFG_POOL_NEW):{
-                printf("pool new ");
-                print_1_cfg(lcfg);
-                break;
-        }
-        case(LCFG_POOL_ADD):{
-                printf("pool add ");
-                print_1_cfg(lcfg);
-                break;
-        }
-        case(LCFG_POOL_REM):{
-                printf("pool remove ");
-                print_1_cfg(lcfg);
-                break;
-        }
-        case(LCFG_POOL_DEL):{
-                printf("pool destroy ");
-                print_1_cfg(lcfg);
-                break;
-        }
-        default:
-                printf("unsupported cmd_code = %x\n",cmd);
-        }
-        printf("\n");
-        return;
+               /*
+                * Handle overflow of 32-bit time_t gracefully.
+                * The copy to time_tmp is needed in any case to
+                * keep the pointer happy, even on 64-bit systems.
+                */
+               time_tmp = marker->cm_createtime;
+               if (time_tmp == marker->cm_createtime) {
+                       ctime_r(&time_tmp, createtime);
+                       createtime[strlen(createtime) - 1] = 0;
+               } else {
+                       strcpy(createtime, "in the distant future");
+               }
+
+               if (marker->cm_canceltime) {
+                       /*
+                        * Like cm_createtime, we try to handle overflow of
+                        * 32-bit time_t gracefully. The copy to time_tmp
+                        * is also needed on 64-bit systems to keep the
+                        * pointer happy, see bug 16771
+                        */
+                       time_tmp = marker->cm_canceltime;
+                       if (time_tmp == marker->cm_canceltime) {
+                               ctime_r(&time_tmp, canceltime);
+                               canceltime[strlen(canceltime) - 1] = 0;
+                       } else {
+                               strcpy(canceltime, "in the distant future");
+                       }
+               }
+
+               printf("marker %3d (flags=%#04x, v%d.%d.%d.%d) %-15s '%s' %s-%s",
+                      marker->cm_step, marker->cm_flags,
+                      OBD_OCD_VERSION_MAJOR(marker->cm_vers),
+                      OBD_OCD_VERSION_MINOR(marker->cm_vers),
+                      OBD_OCD_VERSION_PATCH(marker->cm_vers),
+                      OBD_OCD_VERSION_FIX(marker->cm_vers),
+                      marker->cm_tgtname, marker->cm_comment,
+                      createtime, canceltime);
+               break;
+       }
+       case(LCFG_POOL_NEW):{
+               printf("pool new ");
+               print_1_cfg(lcfg);
+               break;
+       }
+       case(LCFG_POOL_ADD):{
+               printf("pool add ");
+               print_1_cfg(lcfg);
+               break;
+       }
+       case(LCFG_POOL_REM):{
+               printf("pool remove ");
+               print_1_cfg(lcfg);
+               break;
+       }
+       case(LCFG_POOL_DEL):{
+               printf("pool destroy ");
+               print_1_cfg(lcfg);
+               break;
+       }
+       default:
+               printf("unsupported cmd_code = %x\n", cmd);
+       }
+       printf("\n");
 }
 
 static void print_hsm_action(struct llog_agent_req_rec *larr)
 {
-       char    buf[12];
-       int     sz;
+       char buf[12];
+       int sz;
 
        sz = larr->arr_hai.hai_len - sizeof(larr->arr_hai);
-       printf("lrh=[type=%X len=%d idx=%d] fid="DFID
-              " compound/cookie=%#jx/%#jx"
-              " status=%s action=%s archive#=%d flags=%#jx"
-              " create=%ju change=%ju"
-              " extent=%#jx-%#jx gid=%#jx datalen=%d"
-              " data=[%s]\n",
+       printf("lrh=[type=%X len=%d idx=%d] fid="DFID" compound/cookie=%#llx/%#llx status=%s action=%s archive#=%d flags=%#llx create=%llu change=%llu extent=%#llx-%#llx gid=%#llx datalen=%d data=[%s]\n",
               larr->arr_hdr.lrh_type,
               larr->arr_hdr.lrh_len, larr->arr_hdr.lrh_index,
               PFID(&larr->arr_hai.hai_fid),
-              (uintmax_t)larr->arr_compound_id,
-              (uintmax_t)larr->arr_hai.hai_cookie,
+              (unsigned long long)larr->arr_compound_id,
+              (unsigned long long)larr->arr_hai.hai_cookie,
               agent_req_status2name(larr->arr_status),
               hsm_copytool_action2name(larr->arr_hai.hai_action),
               larr->arr_archive_id,
-              (uintmax_t)larr->arr_flags,
-              (uintmax_t)larr->arr_req_create,
-              (uintmax_t)larr->arr_req_change,
-              (uintmax_t)larr->arr_hai.hai_extent.offset,
-              (uintmax_t)larr->arr_hai.hai_extent.length,
-              (uintmax_t)larr->arr_hai.hai_gid, sz,
+              (unsigned long long)larr->arr_flags,
+              (unsigned long long)larr->arr_req_create,
+              (unsigned long long)larr->arr_req_change,
+              (unsigned long long)larr->arr_hai.hai_extent.offset,
+              (unsigned long long)larr->arr_hai.hai_extent.length,
+              (unsigned long long)larr->arr_hai.hai_gid, sz,
               hai_dump_data_field(&larr->arr_hai, buf, sizeof(buf)));
 }
 
 void print_changelog_rec(struct llog_changelog_rec *rec)
 {
-       printf("changelog record id:0x%x cr_flags:0x%x cr_type:%s(0x%x)\n",
-              le32_to_cpu(rec->cr_hdr.lrh_id),
-              le32_to_cpu(rec->cr.cr_flags),
-              changelog_type2str(le32_to_cpu(rec->cr.cr_type)),
-              le32_to_cpu(rec->cr.cr_type));
+       time_t secs;
+       struct tm ts;
+
+       secs = __le64_to_cpu(rec->cr.cr_time) >> 30;
+       gmtime_r(&secs, &ts);
+       printf("changelog record id:0x%x index:%llu cr_flags:0x%x cr_type:%s(0x%x) date:'%02d:%02d:%02d.%09d %04d.%02d.%02d' target:"DFID,
+              __le32_to_cpu(rec->cr_hdr.lrh_id),
+              (unsigned long long)__le64_to_cpu(rec->cr.cr_index),
+              __le32_to_cpu(rec->cr.cr_flags),
+              changelog_type2str(__le32_to_cpu(rec->cr.cr_type)),
+              __le32_to_cpu(rec->cr.cr_type),
+              ts.tm_hour, ts.tm_min, ts.tm_sec,
+              (int)(__le64_to_cpu(rec->cr.cr_time) & ((1 << 30) - 1)),
+              ts.tm_year + 1900, ts.tm_mon + 1, ts.tm_mday,
+              PFID(&rec->cr.cr_tfid));
+
+       if (rec->cr.cr_flags & CLF_JOBID) {
+               struct changelog_ext_jobid *jid =
+                       changelog_rec_jobid(&rec->cr);
+
+               if (jid->cr_jobid[0] != '\0')
+                       printf(" jobid:%s", jid->cr_jobid);
+       }
+
+       if (rec->cr.cr_flags & CLF_EXTRA_FLAGS) {
+               struct changelog_ext_extra_flags *ef =
+                       changelog_rec_extra_flags(&rec->cr);
+
+               printf(" cr_extra_flags:0x%llx",
+                      (unsigned long long)__le64_to_cpu(ef->cr_extra_flags));
+
+               if (ef->cr_extra_flags & CLFE_UIDGID) {
+                       struct changelog_ext_uidgid *uidgid =
+                               changelog_rec_uidgid(&rec->cr);
+
+                       printf(" user:%u:%u",
+                              __le32_to_cpu(uidgid->cr_uid),
+                              __le32_to_cpu(uidgid->cr_gid));
+               }
+               if (ef->cr_extra_flags & CLFE_NID) {
+                       struct changelog_ext_nid *nid =
+                               changelog_rec_nid(&rec->cr);
+
+                       printf(" nid:%s",
+                              libcfs_nid2str(nid->cr_nid));
+               }
+
+               if (ef->cr_extra_flags & CLFE_OPEN) {
+                       struct changelog_ext_openmode *omd =
+                               changelog_rec_openmode(&rec->cr);
+                       char mode[] = "---";
+
+                       /* exec mode must be exclusive */
+                       if (__le32_to_cpu(omd->cr_openflags) & MDS_FMODE_EXEC) {
+                               mode[2] = 'x';
+                       } else {
+                               if (__le32_to_cpu(omd->cr_openflags) &
+                                   MDS_FMODE_READ)
+                                       mode[0] = 'r';
+                               if (__le32_to_cpu(omd->cr_openflags) &
+                          (MDS_FMODE_WRITE | MDS_OPEN_TRUNC | MDS_OPEN_APPEND))
+                                       mode[1] = 'w';
+                       }
+
+                       if (strcmp(mode, "---") != 0)
+                               printf(" mode:%s", mode);
+               }
+
+               if (ef->cr_extra_flags & CLFE_XATTR) {
+                       struct changelog_ext_xattr *xattr =
+                               changelog_rec_xattr(&rec->cr);
+
+                       if (xattr->cr_xattr[0] != '\0')
+                               printf(" xattr:%s", xattr->cr_xattr);
+               }
+       }
+
+       if (rec->cr.cr_namelen)
+               printf(" parent:"DFID" name:%.*s", PFID(&rec->cr.cr_pfid),
+                      __le32_to_cpu(rec->cr.cr_namelen),
+                      changelog_rec_name(&rec->cr));
+
+       if (rec->cr.cr_flags & CLF_RENAME) {
+               struct changelog_ext_rename *rnm =
+                       changelog_rec_rename(&rec->cr);
+
+               if (!fid_is_zero(&rnm->cr_sfid))
+                       printf(" source_fid:"DFID" source_parent_fid:"DFID
+                              " %.*s",
+                              PFID(&rnm->cr_sfid),
+                              PFID(&rnm->cr_spfid),
+                              (int)__le32_to_cpu(
+                                      changelog_rec_snamelen(&rec->cr)),
+                              changelog_rec_sname(&rec->cr));
+       }
+       printf("\n");
+}
+
+static void lustre_swab_lu_fid(struct lu_fid *fid)
+{
+       fid->f_seq = __swab64(fid->f_seq);
+       fid->f_oid = __swab32(fid->f_oid);
+       fid->f_ver = __swab32(fid->f_ver);
+}
+
+static inline size_t
+update_op_size(unsigned int param_count)
+{
+       return offsetof(struct update_op, uop_params_off[param_count]);
+}
+
+
+static inline struct update_op *
+update_op_next_op(const struct update_op *uop)
+{
+       return (struct update_op *)((char *)uop +
+                               update_op_size(uop->uop_param_count));
+}
+
+static void lustre_swab_update_ops(struct update_ops *uops,
+                                  unsigned int op_count)
+{
+       unsigned int i;
+       unsigned int j;
+
+       struct update_op *op =
+              (struct update_op *)((char *)&uops->uops_op[0]);
+
+       for (i = 0; i < op_count; i++, op = update_op_next_op(op)) {
+               lustre_swab_lu_fid(&op->uop_fid);
+               op->uop_type = __swab16(op->uop_type);
+               op->uop_param_count = __swab16(op->uop_param_count);
+               for (j = 0; j < op->uop_param_count; j++)
+                       op->uop_params_off[j] = __swab16(op->uop_params_off[j]);
+       }
+}
+static const char *update_op_str(__u16 opc)
+{
+       static const char *opc_str[] = {
+               [OUT_START] = "start",
+               [OUT_CREATE] = "create",
+               [OUT_DESTROY] = "destroy",
+               [OUT_REF_ADD] = "ref_add",
+               [OUT_REF_DEL] = "ref_del",
+               [OUT_ATTR_SET] = "attr_set",
+               [OUT_ATTR_GET] = "attr_get",
+               [OUT_XATTR_SET] = "xattr_set",
+               [OUT_XATTR_GET] = "xattr_get",
+               [OUT_XATTR_LIST] = "xattr_list",
+               [OUT_INDEX_LOOKUP] = "lookup",
+               [OUT_INDEX_INSERT] = "insert",
+               [OUT_INDEX_DELETE] = "delete",
+               [OUT_WRITE] = "write",
+               [OUT_XATTR_DEL] = "xattr_del",
+               [OUT_PUNCH] = "punch",
+               [OUT_READ] = "read",
+               [OUT_NOOP] = "noop",
+       };
+
+       if (opc < (sizeof(opc_str) / sizeof((opc_str)[0])) &&
+           opc_str[opc] != NULL)
+               return opc_str[opc];
+       else
+               return "unknown";
 }
 
+char *buf2str(void *buf, unsigned int size)
+{
+       const char *hex = "0123456789ABCDEF";
+       char *buf_c = buf;
+       static char string[128];
+       int i, j = 0;
+       bool format_hex = false;
+
+       if (size > 0 && buf_c[size - 1] == 0)
+               size--;
+       for (i = 0; i < size; i++) {
+               if (buf_c[i] >= 0x20 && buf_c[i] <= 0x7E) {
+                       string[j++] = buf_c[i];
+                       format_hex = false;
+               } else if (j < sizeof(string) - 6) {
+                       if (!format_hex) {
+                               string[j++] = '\\';
+                               string[j++] = 'x';
+                               format_hex = true;
+                       }
+                       string[j++] = hex[(buf_c[i] >> 4) & 0xF];
+                       string[j++] = hex[buf_c[i] & 0xF];
+               } else {
+                       break;
+               }
+               if (j == sizeof(string) - 2)
+                       break;
+       }
+       string[j] = 0;
+       return string;
+}
+
+static inline size_t
+object_update_param_size(const struct object_update_param *param)
+{
+       return roundup(sizeof(*param) + param->oup_len, sizeof(__u64));
+}
+
+void print_update_rec(struct llog_update_record *lur)
+{
+       struct update_records *rec = &lur->lur_update_rec;
+       unsigned int i, j, up_count, pm_count;
+       struct update_op *op;
+       struct object_update_param *pm;
+
+       up_count = __le32_to_cpu(rec->ur_update_count);
+       pm_count = __le32_to_cpu(rec->ur_param_count);
+       printf("updatelog record master_transno:%llu batchid:%llu flags:0x%x u_index:%d u_count:%d p_count:%d\n",
+              (unsigned long long)__le64_to_cpu(rec->ur_master_transno),
+              (unsigned long long)__le64_to_cpu(rec->ur_batchid),
+              __le32_to_cpu(rec->ur_flags),
+              __le32_to_cpu(rec->ur_index),
+              up_count,
+              pm_count);
+
+       op = (struct update_op *)((char *)&rec->ur_ops.uops_op[0] + 0);
+       if (op->uop_type != __le16_to_cpu(op->uop_type))
+               lustre_swab_update_ops(&rec->ur_ops, up_count);
+
+       for (i = 0; i < up_count; i++, op = update_op_next_op(op)) {
+               printf("\t"DFID" type:%s/%d params:%d ",
+                      PFID(&op->uop_fid), update_op_str(op->uop_type),
+                      op->uop_type, op->uop_param_count);
+               for (j = 0; j < op->uop_param_count; j++)
+                       printf("p_%d:%d ", j, op->uop_params_off[j]);
+               printf("\n");
+       }
+       pm = (struct object_update_param *) op;
+       for (i = 0; i < pm_count; i++) {
+               printf("\tp_%d - %d/%s\n", i, pm->oup_len,
+                      buf2str(pm->oup_buf, pm->oup_len));
+               pm = (struct object_update_param *)((char *)pm +
+                    object_update_param_size(pm));
+       }
+       printf("\n");
+
+}
+
+static void print_unlink_rec(struct llog_unlink_rec *lur)
+{
+       printf("unlink record id:0x%x target %llx:%x:%x\n",
+               __le32_to_cpu(lur->lur_hdr.lrh_id),
+               (unsigned long long)__le64_to_cpu(lur->lur_oid),
+               __le32_to_cpu(lur->lur_oseq),
+               __le32_to_cpu(lur->lur_count));
+}
+
+static void print_unlink64_rec(struct llog_unlink64_rec *lur)
+{
+       printf("unlink64 record id:0x%x target "DFID"\n",
+               __le32_to_cpu(lur->lur_hdr.lrh_id),
+               PFID(&lur->lur_fid));
+}
+
+static void print_setattr64_rec(struct llog_setattr64_rec *lsr)
+{
+       printf("setattr64 record id:0x%x target "DFID" valid %llx uid %u:%u gid %u:%u\n",
+               __le32_to_cpu(lsr->lsr_hdr.lrh_id),
+               PFID(&lsr->lsr_oi.oi_fid),
+               (unsigned long long)__le64_to_cpu(lsr->lsr_valid),
+               __le32_to_cpu(lsr->lsr_uid_h),
+               __le32_to_cpu(lsr->lsr_uid),
+               __le32_to_cpu(lsr->lsr_gid_h),
+               __le32_to_cpu(lsr->lsr_gid));
+}
+
+static void print_setattr64_rec_v2(struct llog_setattr64_rec_v2 *lsr)
+{
+       printf("setattr64 v2 record id:0x%x target "DFID" valid %llx uid %u:%u gid %u:%u prj %u\n",
+               __le32_to_cpu(lsr->lsr_hdr.lrh_id),
+               PFID(&lsr->lsr_oi.oi_fid),
+               (unsigned long long)__le64_to_cpu(lsr->lsr_valid),
+               __le32_to_cpu(lsr->lsr_uid_h),
+               __le32_to_cpu(lsr->lsr_uid),
+               __le32_to_cpu(lsr->lsr_gid_h),
+               __le32_to_cpu(lsr->lsr_gid),
+               __le32_to_cpu(lsr->lsr_projid));
+}
+
+
 static void print_records(struct llog_rec_hdr **recs,
                          int rec_number, int is_ext)
 {
@@ -638,10 +972,16 @@ static void print_records(struct llog_rec_hdr **recs,
        int i, skip = 0;
 
        for (i = 0; i < rec_number; i++) {
-               printf("#%.2d (%.3d)", le32_to_cpu(recs[i]->lrh_index),
-                      le32_to_cpu(recs[i]->lrh_len));
+               if (!recs[i]) {
+                       llapi_printf(LLAPI_MSG_NORMAL,
+                                    "uninitialized llog record at index %d\n",
+                                    i);
+                       break;
+               }
+               printf("#%.2d (%.3d)", __le32_to_cpu(recs[i]->lrh_index),
+                      __le32_to_cpu(recs[i]->lrh_len));
 
-               lopt = le32_to_cpu(recs[i]->lrh_type);
+               lopt = __le32_to_cpu(recs[i]->lrh_type);
 
                if (recs[i]->lrh_id == CANCELLED)
                        printf("NOT SET ");
@@ -667,8 +1007,28 @@ static void print_records(struct llog_rec_hdr **recs,
                                            recs[i]);
                        break;
                case CHANGELOG_USER_REC:
+               case CHANGELOG_USER_REC2:
                        printf("changelog_user record id:0x%x\n",
-                              le32_to_cpu(recs[i]->lrh_id));
+                              __le32_to_cpu(recs[i]->lrh_id));
+                       break;
+               case UPDATE_REC:
+                       print_update_rec((struct llog_update_record *)recs[i]);
+                       break;
+               case MDS_UNLINK_REC:
+                       print_unlink_rec((struct llog_unlink_rec *)recs[i]);
+                       break;
+               case MDS_UNLINK64_REC:
+                       print_unlink64_rec((struct llog_unlink64_rec *)recs[i]);
+                       break;
+               case MDS_SETATTR64_REC:
+                       if (__le32_to_cpu(recs[i]->lrh_len) >
+                               sizeof(struct llog_setattr64_rec)) {
+                               print_setattr64_rec_v2(
+                                 (struct llog_setattr64_rec_v2 *)recs[i]);
+                       } else {
+                               print_setattr64_rec(
+                                       (struct llog_setattr64_rec *)recs[i]);
+                       }
                        break;
                default:
                        printf("unknown type %x\n", lopt);