From 01fc6fcc345dfc21288347142eaaaa21747d74f3 Mon Sep 17 00:00:00 2001
From: Richard Kennedy <richard@rsk.demon.co.uk>
Date: Fri, 23 May 2008 06:52:00 +0200
Subject: [PATCH] --- yaml --- r: 97415 b: refs/heads/master c:
 be754d2c2161c0cce11d62727016985ecb76831b h: refs/heads/master i:   97413:
 bedd0c47a755fe56da300e5cb1a88453d880569b   97411:
 26eeffd517c6d41de9446361bba0d0876ddac4de   97407:
 9b62f7c11a931020aebfdb80b7d4545f017b1113 v: v3

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

diff --git a/[refs] b/[refs]
index 0936e403ee3a..2a59b5f60325 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 05caf8dbc1880415df3378cfd114d832c9618b60
+refs/heads/master: be754d2c2161c0cce11d62727016985ecb76831b
diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c
index b399c62936e0..4df3f0522435 100644
--- a/trunk/block/cfq-iosched.c
+++ b/trunk/block/cfq-iosched.c
@@ -124,6 +124,8 @@ struct cfq_data {
 struct cfq_queue {
 	/* reference count */
 	atomic_t ref;
+	/* various state flags, see below */
+	unsigned int flags;
 	/* parent cfq_data */
 	struct cfq_data *cfqd;
 	/* service_tree member */
@@ -138,14 +140,14 @@ struct cfq_queue {
 	int queued[2];
 	/* currently allocated requests */
 	int allocated[2];
-	/* pending metadata requests */
-	int meta_pending;
 	/* fifo list of requests in sort_list */
 	struct list_head fifo;
 
 	unsigned long slice_end;
 	long slice_resid;
 
+	/* pending metadata requests */
+	int meta_pending;
 	/* number of requests that are on the dispatch list or inside driver */
 	int dispatched;
 
@@ -153,8 +155,6 @@ struct cfq_queue {
 	unsigned short ioprio, org_ioprio;
 	unsigned short ioprio_class, org_ioprio_class;
 
-	/* various state flags, see below */
-	unsigned int flags;
 };
 
 enum cfqq_state_flags {