From 30988226ba9e5b5fac948eaf148d292d01438a34 Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Tue, 9 Nov 2010 16:35:20 -0800
Subject: [PATCH] --- yaml --- r: 223780 b: refs/heads/master c:
 5e69069c1afb655b5f1a154856ccdb4bb7327b81 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/fs/gfs2/glock.c | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 30df1b3bb067..14e77a3658c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ae51ed7b548c1d943d080da617515e801ea5c3e
+refs/heads/master: 5e69069c1afb655b5f1a154856ccdb4bb7327b81
diff --git a/trunk/fs/gfs2/glock.c b/trunk/fs/gfs2/glock.c
index 13155f60b59d..a9b53a48abeb 100644
--- a/trunk/fs/gfs2/glock.c
+++ b/trunk/fs/gfs2/glock.c
@@ -951,17 +951,22 @@ int gfs2_glock_wait(struct gfs2_holder *gh)
 
 void gfs2_print_dbg(struct seq_file *seq, const char *fmt, ...)
 {
+	struct va_format vaf;
 	va_list args;
 
 	va_start(args, fmt);
+
 	if (seq) {
 		struct gfs2_glock_iter *gi = seq->private;
 		vsprintf(gi->string, fmt, args);
 		seq_printf(seq, gi->string);
 	} else {
-		printk(KERN_ERR " ");
-		vprintk(fmt, args);
+		vaf.fmt = fmt;
+		vaf.va = &args;
+
+		printk(KERN_ERR " %pV", &vaf);
 	}
+
 	va_end(args);
 }