From 9b248b9b33810a8c517ecfac06c6d9a67cb19a69 Mon Sep 17 00:00:00 2001
From: Richard Kennedy <richard@rsk.demon.co.uk>
Date: Mon, 1 Mar 2010 10:50:20 +0100
Subject: [PATCH] --- yaml --- r: 182948 b: refs/heads/master c:
 73e9ffdd0cc8159f876d5e29ecf2d9c1bfca544f h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index e77e890237c8..73ef62885ce7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 91f63d0efa1b2ff3f8773aad61c2970f097232aa
+refs/heads/master: 73e9ffdd0cc8159f876d5e29ecf2d9c1bfca544f
diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c
index 0db07d7771b5..dee9d9378fee 100644
--- a/trunk/block/cfq-iosched.c
+++ b/trunk/block/cfq-iosched.c
@@ -78,11 +78,12 @@ struct cfq_rb_root {
 	struct rb_root rb;
 	struct rb_node *left;
 	unsigned count;
+	unsigned total_weight;
 	u64 min_vdisktime;
 	struct rb_node *active;
-	unsigned total_weight;
 };
-#define CFQ_RB_ROOT	(struct cfq_rb_root) { RB_ROOT, NULL, 0, 0, }
+#define CFQ_RB_ROOT	(struct cfq_rb_root) { .rb = RB_ROOT, .left = NULL, \
+			.count = 0, .min_vdisktime = 0, }
 
 /*
  * Per process-grouping structure