xfs_logprint: Don't error out after split items lose context

xfs_logprint recognizes a "left over region from split log item"
but then expects the *next* op to be a valid start to a new
item.  The problem is, we can split i.e. an xfs_inode_log_format
item, skip over it, and then land on the xfs_icdinode_t
data which follows it - this doesn't have a valid log item
magic (XFS_LI_*) and we error out.  This results in something
like:

  xfs_logprint: unknown log operation type (494e)

Fix this by recognizing that we've skipped over an item and
lost the context we're in, so just continue skipping over
op headers until we find the next valid start to a log item.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/logprint/log_misc.c b/logprint/log_misc.c
index cf9d59da763cdff03a1e443aaebf0c74fe561d60..7070fa3569550a4ad3b76d804e1a3e3a66cb96e5 100644 (file)
--- a/logprint/log_misc.c
+++ b/logprint/log_misc.c
@@ -874,7 +874,7 @@ xlog_print_record(
        int                     bad_hdr_warn)
 {
     xfs_caddr_t                buf, ptr;
-    int                        read_len, skip;
+    int                        read_len, skip, lost_context = 0;
     int                        ret, n, i, j, k;
 
     if (print_no_print)
@@ -995,7 +995,10 @@ xlog_print_record(
        if (xlog_print_find_tid(be32_to_cpu(op_head->oh_tid),
                                op_head->oh_flags & XLOG_WAS_CONT_TRANS)) {
            printf(_("Left over region from split log item\n"));
+           /* Skip this leftover bit */
            ptr += be32_to_cpu(op_head->oh_len);
+           /* We've lost context; don't complain if next one looks bad too */
+           lost_context = 1;
            continue;
        }
 
@@ -1050,7 +1053,7 @@ xlog_print_record(
                        break;
                    }
                    default: {
-                       if (bad_hdr_warn) {
+                       if (bad_hdr_warn && !lost_context) {
                                fprintf(stderr,
                        _("%s: unknown log operation type (%x)\n"),
                                        progname, *(unsigned short *)ptr);
@@ -1064,6 +1067,7 @@ xlog_print_record(
                        }
                        skip = 0;
                        ptr += be32_to_cpu(op_head->oh_len);
+                       lost_context = 0;
                    }
                } /* switch */
            } /* else */