diff -Nru xfsprogs-3.1.9ubuntu2/debian/changelog xfsprogs-3.1.9ubuntu2.1/debian/changelog
--- xfsprogs-3.1.9ubuntu2/debian/changelog	2013-12-18 12:15:08.000000000 -0500
+++ xfsprogs-3.1.9ubuntu2.1/debian/changelog	2018-04-18 08:02:30.000000000 -0400
@@ -1,3 +1,11 @@
+xfsprogs (3.1.9ubuntu2.1) trusty; urgency=medium
+
+  * [dda4129] xfs_logprint: Handle multiply-logged inode fields.
+    xlog_print_trans_inode() will error "illegal inode type" if
+    more than one flag is set on f->ilf_fields. (LP: #1763086)
+
+ -- Eric Desrochers <eric.desrochers@canonical.com>  Tue, 10 Apr 2018 16:23:17 -0400
+
 xfsprogs (3.1.9ubuntu2) trusty; urgency=medium
 
   * Patch m4/libtool.m4 for powerpc64le and regenerate configure.
diff -Nru xfsprogs-3.1.9ubuntu2/logprint/log_misc.c xfsprogs-3.1.9ubuntu2.1/logprint/log_misc.c
--- xfsprogs-3.1.9ubuntu2/logprint/log_misc.c	2011-10-21 18:46:09.000000000 -0400
+++ xfsprogs-3.1.9ubuntu2.1/logprint/log_misc.c	2018-04-18 07:59:57.000000000 -0400
@@ -657,97 +657,76 @@
 
     /* does anything come next */
     op_head = (xlog_op_header_t *)*ptr;
-    switch (f->ilf_fields & XFS_ILOG_NONCORE) {
-	case XFS_ILOG_DEXT: {
-	    ASSERT(f->ilf_size == 3);
-	    (*i)++;
-	    xlog_print_op_header(op_head, *i, ptr);
-	    printf(_("EXTENTS inode data\n"));
-	    *ptr += be32_to_cpu(op_head->oh_len);
-	    if (XLOG_SET(op_head->oh_flags, XLOG_CONTINUE_TRANS))  {
-		return 1;
-	    }
-	    break;
-	}
-	case XFS_ILOG_DBROOT: {
-	    ASSERT(f->ilf_size == 3);
-	    (*i)++;
-	    xlog_print_op_header(op_head, *i, ptr);
-	    printf(_("BTREE inode data\n"));
-	    *ptr += be32_to_cpu(op_head->oh_len);
-	    if (XLOG_SET(op_head->oh_flags, XLOG_CONTINUE_TRANS))  {
-		return 1;
-	    }
-	    break;
-	}
-	case XFS_ILOG_DDATA: {
-	    ASSERT(f->ilf_size == 3);
-	    (*i)++;
-	    xlog_print_op_header(op_head, *i, ptr);
-	    printf(_("LOCAL inode data\n"));
-	    if (mode == S_IFDIR) {
-		xlog_print_dir_sf((xfs_dir_shortform_t*)*ptr, size);
-	    }
-	    *ptr += be32_to_cpu(op_head->oh_len);
-	    if (XLOG_SET(op_head->oh_flags, XLOG_CONTINUE_TRANS)) {
-		return 1;
-	    }
-	    break;
-	}
-	case XFS_ILOG_AEXT: {
-	    ASSERT(f->ilf_size == 3);
+
+    switch (f->ilf_fields & (XFS_ILOG_DEV | XFS_ILOG_UUID)) {
+    case XFS_ILOG_DEV:
+       printf(_("DEV inode: no extra region\n"));
+       break;
+    case XFS_ILOG_UUID:
+       printf(_("UUID inode: no extra region\n"));
+       break;
+    }
+
+    /* Only the inode core is logged */
+    if (f->ilf_size == 2)
+       return 0;
+
+    ASSERT(f->ilf_size <= 4);
+    ASSERT((f->ilf_size == 3) || (f->ilf_fields & XFS_ILOG_AFORK));
+
+    if (f->ilf_fields & XFS_ILOG_DFORK) {
 	    (*i)++;
 	    xlog_print_op_header(op_head, *i, ptr);
-	    printf(_("EXTENTS inode attr\n"));
-	    *ptr += be32_to_cpu(op_head->oh_len);
-	    if (XLOG_SET(op_head->oh_flags, XLOG_CONTINUE_TRANS))  {
-		return 1;
+
+            switch (f->ilf_fields & XFS_ILOG_DFORK) {
+            case XFS_ILOG_DEXT:
+                printf(_("EXTENTS inode data\n"));
+                break;
+            case XFS_ILOG_DBROOT:
+                printf(_("BTREE inode data\n"));
+                break;
+            case XFS_ILOG_DDATA:
+                printf(_("LOCAL inode data\n"));
+                if (mode == S_IFDIR)
+                    xlog_print_dir_sf((xfs_dir_shortform_t*)*ptr, size);
+                break;
+            default:
+                ASSERT((f->ilf_fields & XFS_ILOG_DFORK) == 0);
+                break;
 	    }
-	    break;
-	}
-	case XFS_ILOG_ABROOT: {
-	    ASSERT(f->ilf_size == 3);
-	    (*i)++;
-	    xlog_print_op_header(op_head, *i, ptr);
-	    printf(_("BTREE inode attr\n"));
+
 	    *ptr += be32_to_cpu(op_head->oh_len);
-	    if (XLOG_SET(op_head->oh_flags, XLOG_CONTINUE_TRANS))  {
-		return 1;
+	    if (XLOG_SET(op_head->oh_flags, XLOG_CONTINUE_TRANS))
+                return 1;	
+            op_head = (xlog_op_header_t *)*ptr;
 	    }
-	    break;
-	}
-	case XFS_ILOG_ADATA: {
-	    ASSERT(f->ilf_size == 3);
+
+	    if (f->ilf_fields & XFS_ILOG_AFORK) {
 	    (*i)++;
 	    xlog_print_op_header(op_head, *i, ptr);
-	    printf(_("LOCAL inode attr\n"));
-	    if (mode == S_IFDIR) {
-		xlog_print_dir_sf((xfs_dir_shortform_t*)*ptr, size);
+
+            switch (f->ilf_fields & XFS_ILOG_AFORK) {
+            case XFS_ILOG_AEXT:
+                printf(_("EXTENTS attr data\n"));
+                break;
+            case XFS_ILOG_ABROOT:
+                printf(_("BTREE attr data\n"));
+                break;
+            case XFS_ILOG_ADATA:
+                printf(_("LOCAL attr data\n"));
+                if (mode == S_IFDIR)
+                    xlog_print_dir_sf((xfs_dir_shortform_t*)*ptr, size);
+                break;
+            default:
+                ASSERT((f->ilf_fields & XFS_ILOG_AFORK) == 0);
+                break;
 	    }
 	    *ptr += be32_to_cpu(op_head->oh_len);
-	    if (XLOG_SET(op_head->oh_flags, XLOG_CONTINUE_TRANS)) {
+	    if (XLOG_SET(op_head->oh_flags, XLOG_CONTINUE_TRANS))
 		return 1;
-	    }
-	    break;
-	}
-	case XFS_ILOG_DEV: {
-	    ASSERT(f->ilf_size == 2);
-	    printf(_("DEV inode: no extra region\n"));
-	    break;
-	}
-	case XFS_ILOG_UUID: {
-	    ASSERT(f->ilf_size == 2);
-	    printf(_("UUID inode: no extra region\n"));
-	    break;
-	}
-	case 0: {
-	    ASSERT(f->ilf_size == 2);
-	    break;
-	}
-	default: {
-	    xlog_panic(_("xlog_print_trans_inode: illegal inode type"));
-	}
+	        op_head = (xlog_op_header_t *)*ptr;
     }
+
     return 0;
 }	/* xlog_print_trans_inode */