---

yaml --- r: 182919 b: refs/heads/master c: c4081ba h: refs/heads/master i: 182917: 0ddcb99 182915: 39cc1ea 182911: 44835a9 v: v3
git-mirror · Feb 22, 2010 · fa85f98 · fa85f98
1 parent 79f3dde
commit fa85f98
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f11cbd74c5ff3614f6390b4de67a6ffdc614c378
+refs/heads/master: c4081ba5c9f6f7bdffe49e501a8604a2c0797ef9
diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c
@@ -115,11 +115,11 @@ struct cfq_queue {
 	/* time when queue got scheduled in to dispatch first request. */
 	unsigned long dispatch_start;
 	unsigned int allocated_slice;
+	unsigned int slice_dispatch;
 	/* time when first request from queue completed and slice started. */
 	unsigned long slice_start;
 	unsigned long slice_end;
 	long slice_resid;
-	unsigned int slice_dispatch;
 
 	/* pending metadata requests */
 	int meta_pending;
@@ -130,13 +130,13 @@ struct cfq_queue {
 	unsigned short ioprio, org_ioprio;
 	unsigned short ioprio_class, org_ioprio_class;
 
+	pid_t pid;
+
 	unsigned int seek_samples;
 	u64 seek_total;
 	sector_t seek_mean;
 	sector_t last_request_pos;
 
-	pid_t pid;
-
 	struct cfq_rb_root *service_tree;
 	struct cfq_queue *new_cfqq;
 	struct cfq_group *cfqg;