5 files changed, 28 insertions, 29 deletions

diff --git a/fs/jfs/jfs_imap.c b/fs/jfs/jfs_imap.c
index 19da0e17e4de..3870ba8b9086 100644
--- a/fs/jfs/jfs_imap.c
+++ b/fs/jfs/jfs_imap.c
@@ -890,8 +890,8 @@ int diFree(struct inode *ip)
          * the map.
          */
         if (iagno >= imap->im_nextiag) {
-                printk(KERN_ERR "Dump of imap:\n");
-                print_hex_dump(KERN_ERR, DUMP_PREFIX_ADDRESS, imap, 32);
+                print_hex_dump(KERN_ERR, "imap: ", DUMP_PREFIX_ADDRESS, 16, 4,
+                               imap, 32, 0);
                 jfs_error(ip->i_sb,
                           "diFree: inum = %d, iagno = %d, nextiag = %d",
                           (uint) inum, iagno, imap->im_nextiag);
diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c
index 2917ede90d67..de3e4a506dbc 100644
--- a/fs/jfs/jfs_logmgr.c
+++ b/fs/jfs/jfs_logmgr.c
@@ -1626,22 +1626,22 @@ void jfs_flush_journal(struct jfs_log *log, int wait)
                 list_for_each_entry(lp, &log->synclist, synclist) {
                         if (lp->xflag & COMMIT_PAGE) {
                                 struct metapage *mp = (struct metapage *)lp;
-                                printk (KERN_ERR "orphan metapage:\n");
-                                print_hex_dump(KERN_ERR, DUMP_PREFIX_ADDRESS,
-                                               lp, sizeof(struct metapage));
-                                printk (KERN_ERR "page:\n");
-                                print_hex_dump(KERN_ERR, DUMP_PREFIX_ADDRESS,
-                                               mp->page, sizeof(struct page));
-                        }
-                        else {
-                                printk (KERN_ERR "orphan tblock:\n");
-                                print_hex_dump(KERN_ERR, DUMP_PREFIX_ADDRESS,
-                                               lp, sizeof(struct tblock));
-                        }
+                                print_hex_dump(KERN_ERR, "metapage: ",
+                                               DUMP_PREFIX_ADDRESS, 16, 4,
+                                               mp, sizeof(struct metapage), 0);
+                                print_hex_dump(KERN_ERR, "page: ",
+                                               DUMP_PREFIX_ADDRESS, 16,
+                                               sizeof(long), mp->page,
+                                               sizeof(struct page), 0);
+                        } else
+                                print_hex_dump(KERN_ERR, "tblock:",
+                                               DUMP_PREFIX_ADDRESS, 16, 4,
+                                               lp, sizeof(struct tblock), 0);
                 }
         }
+#else
+        WARN_ON(!list_empty(&log->synclist));
 #endif
-        //assert(list_empty(&log->synclist));
         clear_bit(log_FLUSH, &log->flag);
 }
 
diff --git a/fs/jfs/jfs_metapage.c b/fs/jfs/jfs_metapage.c
index 1c4fced1e6d8..77c7f1129dde 100644
--- a/fs/jfs/jfs_metapage.c
+++ b/fs/jfs/jfs_metapage.c
@@ -472,8 +472,8 @@ add_failed:
         printk(KERN_ERR "JFS: bio_add_page failed unexpectedly\n");
         goto skip;
 dump_bio:
-        printk(KERN_ERR "JFS: dump of bio:\n");
-        print_hex_dump(KERN_ERR, DUMP_PREFIX_ADDRESS, bio, sizeof(*bio));
+        print_hex_dump(KERN_ERR, "JFS: dump of bio: ", DUMP_PREFIX_ADDRESS, 16,
+                       4, bio, sizeof(*bio), 0);
 skip:
         bio_put(bio);
         unlock_page(page);
diff --git a/fs/jfs/jfs_txnmgr.c b/fs/jfs/jfs_txnmgr.c
index d6f23f90ad36..7aa1f7004eaf 100644
--- a/fs/jfs/jfs_txnmgr.c
+++ b/fs/jfs/jfs_txnmgr.c
@@ -830,16 +830,15 @@ struct tlock *txLock(tid_t tid, struct inode *ip, struct metapage * mp,
         /* assert(jfs_ip->fileset == AGGREGATE_I); */
         if (jfs_ip->fileset != AGGREGATE_I) {
                 printk(KERN_ERR "txLock: trying to lock locked page!");
-                printk(KERN_ERR "ip:\n");
-                print_hex_dump(KERN_ERR, DUMP_PREFIX_ADDRESS, ip, sizeof(*ip));
-                printk(KERN_ERR "mp:\n");
-                print_hex_dump(KERN_ERR, DUMP_PREFIX_ADDRESS, mp, sizeof(*mp));
-                printk(KERN_ERR "Locker's tblk:\n");
-                print_hex_dump(KERN_ERR, DUMP_PREFIX_ADDRESS,
-                               tid_to_tblock(tid), sizeof(struct tblock));
-                printk(KERN_ERR "Tlock:\n");
-                print_hex_dump(KERN_ERR, DUMP_PREFIX_ADDRESS, tlck,
-                               sizeof(*tlck));
+                print_hex_dump(KERN_ERR, "ip: ", DUMP_PREFIX_ADDRESS, 16, 4,
+                               ip, sizeof(*ip), 0);
+                print_hex_dump(KERN_ERR, "mp: ", DUMP_PREFIX_ADDRESS, 16, 4,
+                               mp, sizeof(*mp), 0);
+                print_hex_dump(KERN_ERR, "Locker's tblock: ",
+                               DUMP_PREFIX_ADDRESS, 16, 4, tid_to_tblock(tid),
+                               sizeof(struct tblock), 0);
+                print_hex_dump(KERN_ERR, "Tlock: ", DUMP_PREFIX_ADDRESS, 16, 4,
+                               tlck, sizeof(*tlck), 0);
                 BUG();
         }
         INCREMENT(stattx.waitlock);     /* statistics */
diff --git a/fs/jfs/xattr.c b/fs/jfs/xattr.c
index 2dcb13275429..b2375f0774b7 100644
--- a/fs/jfs/xattr.c
+++ b/fs/jfs/xattr.c
@@ -590,8 +590,8 @@ static int ea_get(struct inode *inode, struct ea_buffer *ea_buf, int min_size)
       size_check:
         if (EALIST_SIZE(ea_buf->xattr) != ea_size) {
                 printk(KERN_ERR "ea_get: invalid extended attribute\n");
-                print_hex_dump(KERN_ERR, DUMP_PREFIX_ADDRESS, ea_buf->xattr,
-                               ea_size);
+                print_hex_dump(KERN_ERR, "", DUMP_PREFIX_ADDRESS, 16, 1,
+                                     ea_buf->xattr, ea_size, 1);
                 ea_release(inode, ea_buf);
                 rc = -EIO;
                 goto clean_up;