From e68c1225d1f968c9b1951831ac3313303c0da3de Mon Sep 17 00:00:00 2001
From: Kyungmin Park <kyungmin.park@samsung.com>
Date: Tue, 31 May 2011 10:04:09 +0200
Subject: [PATCH] --- yaml --- r: 253023 b: refs/heads/master c:
 4495a7d41dbda03841c2a1c2a5ce7135a45131ba h: refs/heads/master i:   253021:
 1bb5cb3b4a10d7f6281b4957cf14fdda47cb08b3   253019:
 7684720645e9e6445010fa055c720e7f6cabc27d   253015:
 d4479a0a78bc0b3fafc1cc6eec2d03c7c70746e4   253007:
 1773e7fa2cd9432a4bd4e01b8a2d3f86ae244380   252991:
 11454bae63a4bfe56f7e153665346ad34c0a779a v: v3

---
 [refs]                    | 2 +-
 trunk/block/cfq-iosched.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 0264250c06ff..9148c95975d1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea9d6553b3b3044e7374774cc33bb1b2eee19dd3
+refs/heads/master: 4495a7d41dbda03841c2a1c2a5ce7135a45131ba
diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c
index 7c52d6888924..8a02c955c610 100644
--- a/trunk/block/cfq-iosched.c
+++ b/trunk/block/cfq-iosched.c
@@ -185,7 +185,7 @@ struct cfq_group {
 	int nr_cfqq;
 
 	/*
-	 * Per group busy queus average. Useful for workload slice calc. We
+	 * Per group busy queues average. Useful for workload slice calc. We
 	 * create the array for each prio class but at run time it is used
 	 * only for RT and BE class and slot for IDLE class remains unused.
 	 * This is primarily done to avoid confusion and a gcc warning.
@@ -369,16 +369,16 @@ CFQ_CFQQ_FNS(wait_busy);
 #define cfq_log_cfqq(cfqd, cfqq, fmt, args...)	\
 	blk_add_trace_msg((cfqd)->queue, "cfq%d%c %s " fmt, (cfqq)->pid, \
 			cfq_cfqq_sync((cfqq)) ? 'S' : 'A', \
-			blkg_path(&(cfqq)->cfqg->blkg), ##args);
+			blkg_path(&(cfqq)->cfqg->blkg), ##args)
 
 #define cfq_log_cfqg(cfqd, cfqg, fmt, args...)				\
 	blk_add_trace_msg((cfqd)->queue, "%s " fmt,			\
-				blkg_path(&(cfqg)->blkg), ##args);      \
+				blkg_path(&(cfqg)->blkg), ##args)       \
 
 #else
 #define cfq_log_cfqq(cfqd, cfqq, fmt, args...)	\
 	blk_add_trace_msg((cfqd)->queue, "cfq%d " fmt, (cfqq)->pid, ##args)
-#define cfq_log_cfqg(cfqd, cfqg, fmt, args...)		do {} while (0);
+#define cfq_log_cfqg(cfqd, cfqg, fmt, args...)		do {} while (0)
 #endif
 #define cfq_log(cfqd, fmt, args...)	\
 	blk_add_trace_msg((cfqd)->queue, "cfq " fmt, ##args)