From 68ef8caccc10db74401a047d4e188fb046519c5a Mon Sep 17 00:00:00 2001
From: Jeff Mahoney <jeffm@suse.com>
Date: Mon, 30 Mar 2009 14:02:22 -0400
Subject: [PATCH] --- yaml --- r: 138843 b: refs/heads/master c:
 cacbe3d7ad3c0a345ca1ce7bf1ecb4c5bfe54d7b h: refs/heads/master i:   138841:
 c6598bff0610b247e5571815d75755055a916d56   138839:
 cd417e4077781ca92f8d9f1f1ea38b2ef5dc3120 v: v3

---
 [refs]                     |  2 +-
 trunk/fs/reiserfs/prints.c | 12 +++---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 7009461bac4a..b26f80a7baaf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 45b03d5e8e674eb6555b767e1c8eb40b671ff892
+refs/heads/master: cacbe3d7ad3c0a345ca1ce7bf1ecb4c5bfe54d7b
diff --git a/trunk/fs/reiserfs/prints.c b/trunk/fs/reiserfs/prints.c
index 50ed4bd3ef63..b87b23717c23 100644
--- a/trunk/fs/reiserfs/prints.c
+++ b/trunk/fs/reiserfs/prints.c
@@ -157,19 +157,16 @@ static void sprintf_disk_child(char *buf, struct disk_child *dc)
 		dc_size(dc));
 }
 
-static char *is_there_reiserfs_struct(char *fmt, int *what, int *skip)
+static char *is_there_reiserfs_struct(char *fmt, int *what)
 {
 	char *k = fmt;
 
-	*skip = 0;
-
 	while ((k = strchr(k, '%')) != NULL) {
 		if (k[1] == 'k' || k[1] == 'K' || k[1] == 'h' || k[1] == 't' ||
 		    k[1] == 'z' || k[1] == 'b' || k[1] == 'y' || k[1] == 'a') {
 			*what = k[1];
 			break;
 		}
-		(*skip)++;
 		k++;
 	}
 	return k;
@@ -193,18 +190,15 @@ static void prepare_error_buf(const char *fmt, va_list args)
 	char *fmt1 = fmt_buf;
 	char *k;
 	char *p = error_buf;
-	int i, j, what, skip;
+	int what;
 
 	strcpy(fmt1, fmt);
 
-	while ((k = is_there_reiserfs_struct(fmt1, &what, &skip)) != NULL) {
+	while ((k = is_there_reiserfs_struct(fmt1, &what)) != NULL) {
 		*k = 0;
 
 		p += vsprintf(p, fmt1, args);
 
-		for (i = 0; i < skip; i++)
-			j = va_arg(args, int);
-
 		switch (what) {
 		case 'k':
 			sprintf_le_key(p, va_arg(args, struct reiserfs_key *));