From 6d99a374445457263dd5d10e071200c4b95d0f5f Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Wed, 12 Dec 2012 10:19:08 -0800 Subject: [PATCH] --- yaml --- r: 366313 b: refs/heads/master c: 7af584d3b0e0ba025562198e6bfbff3c0fe1f17e h: refs/heads/master i: 366311: 9ee371d8eac7787e2259d68abd63721039fe6d2e v: v3 --- [refs] | 2 +- trunk/fs/gfs2/glock.c | 4 ++-- trunk/fs/gfs2/trans.c | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index ad7ae3bdbc58..ff5d69325f28 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c8d5cb74d52749c242e15bdd50298a1168d90a4d +refs/heads/master: 7af584d3b0e0ba025562198e6bfbff3c0fe1f17e diff --git a/trunk/fs/gfs2/glock.c b/trunk/fs/gfs2/glock.c index cf3515546739..bd8223595495 100644 --- a/trunk/fs/gfs2/glock.c +++ b/trunk/fs/gfs2/glock.c @@ -1017,11 +1017,11 @@ __acquires(&gl->gl_spin) return; trap_recursive: - print_symbol(KERN_ERR "original: %s\n", gh2->gh_ip); + printk(KERN_ERR "original: %pSR\n", (void *)gh2->gh_ip); printk(KERN_ERR "pid: %d\n", pid_nr(gh2->gh_owner_pid)); printk(KERN_ERR "lock type: %d req lock state : %d\n", gh2->gh_gl->gl_name.ln_type, gh2->gh_state); - print_symbol(KERN_ERR "new: %s\n", gh->gh_ip); + printk(KERN_ERR "new: %pSR\n", (void *)gh->gh_ip); printk(KERN_ERR "pid: %d\n", pid_nr(gh->gh_owner_pid)); printk(KERN_ERR "lock type: %d req lock state : %d\n", gh->gh_gl->gl_name.ln_type, gh->gh_state); diff --git a/trunk/fs/gfs2/trans.c b/trunk/fs/gfs2/trans.c index 88162fae27a5..5bc023ea38ac 100644 --- a/trunk/fs/gfs2/trans.c +++ b/trunk/fs/gfs2/trans.c @@ -96,7 +96,8 @@ static void gfs2_log_release(struct gfs2_sbd *sdp, unsigned int blks) static void gfs2_print_trans(const struct gfs2_trans *tr) { - print_symbol(KERN_WARNING "GFS2: Transaction created at: %s\n", tr->tr_ip); + printk(KERN_WARNING "GFS2: Transaction created at: %pSR\n", + (void *)tr->tr_ip); printk(KERN_WARNING "GFS2: blocks=%u revokes=%u reserved=%u touched=%d\n", tr->tr_blocks, tr->tr_revokes, tr->tr_reserved, tr->tr_touched); printk(KERN_WARNING "GFS2: Buf %u/%u Databuf %u/%u Revoke %u/%u\n",