gfs2: Convert print_symbol to %pSR

Use the new vsprintf extension to avoid any possible
message interleaving.

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Steven Whitehouse <swhiteho@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index cf35155467394b27f16d20fed8c57e8c6f40e016..bd82235954959cf69f791cafb12dcfc04b9410ec 100644 (file)
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -1017,11 +1017,11 @@ do_cancel:
        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/fs/gfs2/trans.c b/fs/gfs2/trans.c
index 88162fae27a547ffe9a88364fd15fc90e79dad43..5bc023ea38acb2aa158ac9ae52c60dd01a34a434 100644 (file)
--- 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)
 
 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",