Commit 288e4d83 authored by Dave Kleikamp's avatar Dave Kleikamp
Browse files

JFS: Update print_hex_dump() syntax


Signed-off-by: default avatarDave Kleikamp <shaggy@linux.vnet.ibm.com>
parent 209e101b
...@@ -890,8 +890,8 @@ int diFree(struct inode *ip) ...@@ -890,8 +890,8 @@ int diFree(struct inode *ip)
* the map. * the map.
*/ */
if (iagno >= imap->im_nextiag) { if (iagno >= imap->im_nextiag) {
printk(KERN_ERR "Dump of imap:\n"); print_hex_dump(KERN_ERR, "imap: ", DUMP_PREFIX_ADDRESS, 16, 4,
print_hex_dump(KERN_ERR, DUMP_PREFIX_ADDRESS, imap, 32); imap, 32, 0);
jfs_error(ip->i_sb, jfs_error(ip->i_sb,
"diFree: inum = %d, iagno = %d, nextiag = %d", "diFree: inum = %d, iagno = %d, nextiag = %d",
(uint) inum, iagno, imap->im_nextiag); (uint) inum, iagno, imap->im_nextiag);
......
...@@ -1626,22 +1626,22 @@ void jfs_flush_journal(struct jfs_log *log, int wait) ...@@ -1626,22 +1626,22 @@ void jfs_flush_journal(struct jfs_log *log, int wait)
list_for_each_entry(lp, &log->synclist, synclist) { list_for_each_entry(lp, &log->synclist, synclist) {
if (lp->xflag & COMMIT_PAGE) { if (lp->xflag & COMMIT_PAGE) {
struct metapage *mp = (struct metapage *)lp; struct metapage *mp = (struct metapage *)lp;
printk (KERN_ERR "orphan metapage:\n"); print_hex_dump(KERN_ERR, "metapage: ",
print_hex_dump(KERN_ERR, DUMP_PREFIX_ADDRESS, DUMP_PREFIX_ADDRESS, 16, 4,
lp, sizeof(struct metapage)); mp, sizeof(struct metapage), 0);
printk (KERN_ERR "page:\n"); print_hex_dump(KERN_ERR, "page: ",
print_hex_dump(KERN_ERR, DUMP_PREFIX_ADDRESS, DUMP_PREFIX_ADDRESS, 16,
mp->page, sizeof(struct page)); sizeof(long), mp->page,
} sizeof(struct page), 0);
else { } else
printk (KERN_ERR "orphan tblock:\n"); print_hex_dump(KERN_ERR, "tblock:",
print_hex_dump(KERN_ERR, DUMP_PREFIX_ADDRESS, DUMP_PREFIX_ADDRESS, 16, 4,
lp, sizeof(struct tblock)); lp, sizeof(struct tblock), 0);
}
} }
} }
#else
WARN_ON(!list_empty(&log->synclist));
#endif #endif
//assert(list_empty(&log->synclist));
clear_bit(log_FLUSH, &log->flag); clear_bit(log_FLUSH, &log->flag);
} }
......
...@@ -472,8 +472,8 @@ add_failed: ...@@ -472,8 +472,8 @@ add_failed:
printk(KERN_ERR "JFS: bio_add_page failed unexpectedly\n"); printk(KERN_ERR "JFS: bio_add_page failed unexpectedly\n");
goto skip; goto skip;
dump_bio: dump_bio:
printk(KERN_ERR "JFS: dump of bio:\n"); print_hex_dump(KERN_ERR, "JFS: dump of bio: ", DUMP_PREFIX_ADDRESS, 16,
print_hex_dump(KERN_ERR, DUMP_PREFIX_ADDRESS, bio, sizeof(*bio)); 4, bio, sizeof(*bio), 0);
skip: skip:
bio_put(bio); bio_put(bio);
unlock_page(page); unlock_page(page);
......
...@@ -830,16 +830,15 @@ struct tlock *txLock(tid_t tid, struct inode *ip, struct metapage * mp, ...@@ -830,16 +830,15 @@ struct tlock *txLock(tid_t tid, struct inode *ip, struct metapage * mp,
/* assert(jfs_ip->fileset == AGGREGATE_I); */ /* assert(jfs_ip->fileset == AGGREGATE_I); */
if (jfs_ip->fileset != AGGREGATE_I) { if (jfs_ip->fileset != AGGREGATE_I) {
printk(KERN_ERR "txLock: trying to lock locked page!"); printk(KERN_ERR "txLock: trying to lock locked page!");
printk(KERN_ERR "ip:\n"); print_hex_dump(KERN_ERR, "ip: ", DUMP_PREFIX_ADDRESS, 16, 4,
print_hex_dump(KERN_ERR, DUMP_PREFIX_ADDRESS, ip, sizeof(*ip)); ip, sizeof(*ip), 0);
printk(KERN_ERR "mp:\n"); print_hex_dump(KERN_ERR, "mp: ", DUMP_PREFIX_ADDRESS, 16, 4,
print_hex_dump(KERN_ERR, DUMP_PREFIX_ADDRESS, mp, sizeof(*mp)); mp, sizeof(*mp), 0);
printk(KERN_ERR "Locker's tblk:\n"); print_hex_dump(KERN_ERR, "Locker's tblock: ",
print_hex_dump(KERN_ERR, DUMP_PREFIX_ADDRESS, DUMP_PREFIX_ADDRESS, 16, 4, tid_to_tblock(tid),
tid_to_tblock(tid), sizeof(struct tblock)); sizeof(struct tblock), 0);
printk(KERN_ERR "Tlock:\n"); print_hex_dump(KERN_ERR, "Tlock: ", DUMP_PREFIX_ADDRESS, 16, 4,
print_hex_dump(KERN_ERR, DUMP_PREFIX_ADDRESS, tlck, tlck, sizeof(*tlck), 0);
sizeof(*tlck));
BUG(); BUG();
} }
INCREMENT(stattx.waitlock); /* statistics */ INCREMENT(stattx.waitlock); /* statistics */
......
...@@ -590,8 +590,8 @@ static int ea_get(struct inode *inode, struct ea_buffer *ea_buf, int min_size) ...@@ -590,8 +590,8 @@ static int ea_get(struct inode *inode, struct ea_buffer *ea_buf, int min_size)
size_check: size_check:
if (EALIST_SIZE(ea_buf->xattr) != ea_size) { if (EALIST_SIZE(ea_buf->xattr) != ea_size) {
printk(KERN_ERR "ea_get: invalid extended attribute\n"); printk(KERN_ERR "ea_get: invalid extended attribute\n");
print_hex_dump(KERN_ERR, DUMP_PREFIX_ADDRESS, ea_buf->xattr, print_hex_dump(KERN_ERR, "", DUMP_PREFIX_ADDRESS, 16, 1,
ea_size); ea_buf->xattr, ea_size, 1);
ea_release(inode, ea_buf); ea_release(inode, ea_buf);
rc = -EIO; rc = -EIO;
goto clean_up; goto clean_up;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment