diff options
-rw-r--r-- | fs/gfs2/glock.c | 4 | ||||
-rw-r--r-- | fs/gfs2/trans.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c index cf3515546739..bd8223595495 100644 --- a/fs/gfs2/glock.c +++ b/fs/gfs2/glock.c | |||
@@ -1017,11 +1017,11 @@ do_cancel: | |||
1017 | return; | 1017 | return; |
1018 | 1018 | ||
1019 | trap_recursive: | 1019 | trap_recursive: |
1020 | print_symbol(KERN_ERR "original: %s\n", gh2->gh_ip); | 1020 | printk(KERN_ERR "original: %pSR\n", (void *)gh2->gh_ip); |
1021 | printk(KERN_ERR "pid: %d\n", pid_nr(gh2->gh_owner_pid)); | 1021 | printk(KERN_ERR "pid: %d\n", pid_nr(gh2->gh_owner_pid)); |
1022 | printk(KERN_ERR "lock type: %d req lock state : %d\n", | 1022 | printk(KERN_ERR "lock type: %d req lock state : %d\n", |
1023 | gh2->gh_gl->gl_name.ln_type, gh2->gh_state); | 1023 | gh2->gh_gl->gl_name.ln_type, gh2->gh_state); |
1024 | print_symbol(KERN_ERR "new: %s\n", gh->gh_ip); | 1024 | printk(KERN_ERR "new: %pSR\n", (void *)gh->gh_ip); |
1025 | printk(KERN_ERR "pid: %d\n", pid_nr(gh->gh_owner_pid)); | 1025 | printk(KERN_ERR "pid: %d\n", pid_nr(gh->gh_owner_pid)); |
1026 | printk(KERN_ERR "lock type: %d req lock state : %d\n", | 1026 | printk(KERN_ERR "lock type: %d req lock state : %d\n", |
1027 | gh->gh_gl->gl_name.ln_type, gh->gh_state); | 1027 | gh->gh_gl->gl_name.ln_type, gh->gh_state); |
diff --git a/fs/gfs2/trans.c b/fs/gfs2/trans.c index 88162fae27a5..5bc023ea38ac 100644 --- a/fs/gfs2/trans.c +++ b/fs/gfs2/trans.c | |||
@@ -96,7 +96,8 @@ static void gfs2_log_release(struct gfs2_sbd *sdp, unsigned int blks) | |||
96 | 96 | ||
97 | static void gfs2_print_trans(const struct gfs2_trans *tr) | 97 | static void gfs2_print_trans(const struct gfs2_trans *tr) |
98 | { | 98 | { |
99 | print_symbol(KERN_WARNING "GFS2: Transaction created at: %s\n", tr->tr_ip); | 99 | printk(KERN_WARNING "GFS2: Transaction created at: %pSR\n", |
100 | (void *)tr->tr_ip); | ||
100 | printk(KERN_WARNING "GFS2: blocks=%u revokes=%u reserved=%u touched=%d\n", | 101 | printk(KERN_WARNING "GFS2: blocks=%u revokes=%u reserved=%u touched=%d\n", |
101 | tr->tr_blocks, tr->tr_revokes, tr->tr_reserved, tr->tr_touched); | 102 | tr->tr_blocks, tr->tr_revokes, tr->tr_reserved, tr->tr_touched); |
102 | printk(KERN_WARNING "GFS2: Buf %u/%u Databuf %u/%u Revoke %u/%u\n", | 103 | printk(KERN_WARNING "GFS2: Buf %u/%u Databuf %u/%u Revoke %u/%u\n", |