From bb32fa4c939fca84e1bb1616603ae4a7b5d83719 Mon Sep 17 00:00:00 2001
From: Li Zefan <lizf@cn.fujitsu.com>
Date: Thu, 9 Apr 2009 11:19:40 +0800
Subject: [PATCH] --- yaml --- r: 142919 b: refs/heads/master c:
 9eb85125ce218a8b8d9a7c982510388e227adbec h: refs/heads/master i:   142917:
 e226d7ccf73f94ac6152b1b6efe2e96e1002250e   142915:
 ff87bbb7dda32bdb72aeb19ccc781f631b7cfbc9   142911:
 d13741f542fc0f42140e14238dd7e8767523adc6 v: v3

---
 [refs]                        |  2 +-
 trunk/kernel/trace/blktrace.c | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index cfae9d67f205..ed6edc4de3a0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 47788c58e66c050982241d9a05eb690daceb05a9
+refs/heads/master: 9eb85125ce218a8b8d9a7c982510388e227adbec
diff --git a/trunk/kernel/trace/blktrace.c b/trunk/kernel/trace/blktrace.c
index b32ff446c3fb..921ef5d1f0ba 100644
--- a/trunk/kernel/trace/blktrace.c
+++ b/trunk/kernel/trace/blktrace.c
@@ -1377,12 +1377,12 @@ static int blk_trace_str2mask(const char *str)
 {
 	int i;
 	int mask = 0;
-	char *s, *token;
+	char *buf, *s, *token;
 
-	s = kstrdup(str, GFP_KERNEL);
-	if (s == NULL)
+	buf = kstrdup(str, GFP_KERNEL);
+	if (buf == NULL)
 		return -ENOMEM;
-	s = strstrip(s);
+	s = strstrip(buf);
 
 	while (1) {
 		token = strsep(&s, ",");
@@ -1403,7 +1403,7 @@ static int blk_trace_str2mask(const char *str)
 			break;
 		}
 	}
-	kfree(s);
+	kfree(buf);
 
 	return mask;
 }