---

yaml
---
r: 97415
b: refs/heads/master
c: be754d2
h: refs/heads/master
i:
  97413: bedd0c4
  97411: 26eeffd
  97407: 9b62f7c
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 05caf8dbc1880415df3378cfd114d832c9618b60
+refs/heads/master: be754d2c2161c0cce11d62727016985ecb76831b

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,23 +140,21 @@ 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;
 
 	/* io prio of this group */
 	unsigned short ioprio, org_ioprio;
 	unsigned short ioprio_class, org_ioprio_class;
 
-	/* various state flags, see below */
-	unsigned int flags;
 };
 
 enum cfqq_state_flags {