diff options
-rw-r--r-- | block/cfq-iosched.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index 023f4e69a337..e3dedfd3bcb4 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c | |||
@@ -115,11 +115,11 @@ struct cfq_queue { | |||
115 | /* time when queue got scheduled in to dispatch first request. */ | 115 | /* time when queue got scheduled in to dispatch first request. */ |
116 | unsigned long dispatch_start; | 116 | unsigned long dispatch_start; |
117 | unsigned int allocated_slice; | 117 | unsigned int allocated_slice; |
118 | unsigned int slice_dispatch; | ||
118 | /* time when first request from queue completed and slice started. */ | 119 | /* time when first request from queue completed and slice started. */ |
119 | unsigned long slice_start; | 120 | unsigned long slice_start; |
120 | unsigned long slice_end; | 121 | unsigned long slice_end; |
121 | long slice_resid; | 122 | long slice_resid; |
122 | unsigned int slice_dispatch; | ||
123 | 123 | ||
124 | /* pending metadata requests */ | 124 | /* pending metadata requests */ |
125 | int meta_pending; | 125 | int meta_pending; |
@@ -130,13 +130,13 @@ struct cfq_queue { | |||
130 | unsigned short ioprio, org_ioprio; | 130 | unsigned short ioprio, org_ioprio; |
131 | unsigned short ioprio_class, org_ioprio_class; | 131 | unsigned short ioprio_class, org_ioprio_class; |
132 | 132 | ||
133 | pid_t pid; | ||
134 | |||
133 | unsigned int seek_samples; | 135 | unsigned int seek_samples; |
134 | u64 seek_total; | 136 | u64 seek_total; |
135 | sector_t seek_mean; | 137 | sector_t seek_mean; |
136 | sector_t last_request_pos; | 138 | sector_t last_request_pos; |
137 | 139 | ||
138 | pid_t pid; | ||
139 | |||
140 | struct cfq_rb_root *service_tree; | 140 | struct cfq_rb_root *service_tree; |
141 | struct cfq_queue *new_cfqq; | 141 | struct cfq_queue *new_cfqq; |
142 | struct cfq_group *cfqg; | 142 | struct cfq_group *cfqg; |