Hi,
Acked-by: Steven Whitehouse <swhit...@redhat.com>
Steve.
On Wed, 2012-12-12 at 10:19 -0800, Joe Perches wrote:
> Use the new vsprintf extension to avoid any possible
> message interleaving.
>
> Signed-off-by: Joe Perches <j...@perches.com>
> ---
> fs/gfs2/glock.c | 4 ++--
> 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 992c5c0..453978b 100644
> --- a/fs/gfs2/glock.c
> +++ b/fs/gfs2/glock.c
> @@ -1016,11 +1016,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 4136270..3d8aa7f 100644
> --- a/fs/gfs2/trans.c
> +++ b/fs/gfs2/trans.c
> @@ -95,7 +95,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",
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
