Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 75e50984f062de2abc4bd84c642923e2c48ce2ae

Authored by Jens Axboe
1 parent 2f5cb7381b
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

cfq-iosched: kill two unused cfqq flags 

We only manipulate the must_dispatch and queue_new flags, they are not
tested anymore. So get rid of them.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

Showing 1 changed file with 1 additions and 14 deletions Side-by-side Diff

... ... @@ -179,11 +179,9 @@
179 179 CFQ_CFQQ_FLAG_wait_request, /* waiting for a request */
180 180 CFQ_CFQQ_FLAG_must_alloc, /* must be allowed rq alloc */
181 181 CFQ_CFQQ_FLAG_must_alloc_slice, /* per-slice must_alloc flag */
182   - CFQ_CFQQ_FLAG_must_dispatch, /* must dispatch, even if expired */
183 182 CFQ_CFQQ_FLAG_fifo_expire, /* FIFO checked in this slice */
184 183 CFQ_CFQQ_FLAG_idle_window, /* slice idling enabled */
185 184 CFQ_CFQQ_FLAG_prio_changed, /* task priority has changed */
186   - CFQ_CFQQ_FLAG_queue_new, /* queue never been serviced */
187 185 CFQ_CFQQ_FLAG_slice_new, /* no requests dispatched in slice */
188 186 CFQ_CFQQ_FLAG_sync, /* synchronous queue */
189 187 };
190 188  
... ... @@ -206,11 +204,9 @@
206 204 CFQ_CFQQ_FNS(wait_request);
207 205 CFQ_CFQQ_FNS(must_alloc);
208 206 CFQ_CFQQ_FNS(must_alloc_slice);
209   -CFQ_CFQQ_FNS(must_dispatch);
210 207 CFQ_CFQQ_FNS(fifo_expire);
211 208 CFQ_CFQQ_FNS(idle_window);
212 209 CFQ_CFQQ_FNS(prio_changed);
213   -CFQ_CFQQ_FNS(queue_new);
214 210 CFQ_CFQQ_FNS(slice_new);
215 211 CFQ_CFQQ_FNS(sync);
216 212 #undef CFQ_CFQQ_FNS
217 213  
... ... @@ -777,12 +773,10 @@
777 773 cfqq->slice_end = 0;
778 774 cfqq->slice_dispatch = 0;
779 775  
780   - cfq_clear_cfqq_must_dispatch(cfqq);
781 776 cfq_clear_cfqq_wait_request(cfqq);
782 777 cfq_clear_cfqq_must_alloc_slice(cfqq);
783 778 cfq_clear_cfqq_fifo_expire(cfqq);
784 779 cfq_mark_cfqq_slice_new(cfqq);
785   - cfq_clear_cfqq_queue_new(cfqq);
786 780  
787 781 del_timer(&cfqd->idle_slice_timer);
788 782 }
... ... @@ -802,7 +796,6 @@
802 796 if (cfq_cfqq_wait_request(cfqq))
803 797 del_timer(&cfqd->idle_slice_timer);
804 798  
805   - cfq_clear_cfqq_must_dispatch(cfqq);
806 799 cfq_clear_cfqq_wait_request(cfqq);
807 800  
808 801 /*
... ... @@ -931,7 +924,6 @@
931 924 (sample_valid(cic->ttime_samples) && cic->ttime_mean > 2))
932 925 return;
933 926  
934   - cfq_mark_cfqq_must_dispatch(cfqq);
935 927 cfq_mark_cfqq_wait_request(cfqq);
936 928  
937 929 /*
... ... @@ -1520,7 +1512,6 @@
1520 1512 cfqq->cfqd = cfqd;
1521 1513  
1522 1514 cfq_mark_cfqq_prio_changed(cfqq);
1523   - cfq_mark_cfqq_queue_new(cfqq);
1524 1515  
1525 1516 cfq_init_prio_data(cfqq, ioc);
1526 1517  
... ... @@ -1912,7 +1903,6 @@
1912 1903 * just now
1913 1904 */
1914 1905 if (cfq_cfqq_wait_request(cfqq)) {
1915   - cfq_mark_cfqq_must_dispatch(cfqq);
1916 1906 del_timer(&cfqd->idle_slice_timer);
1917 1907 blk_start_queueing(cfqd->queue);
1918 1908 }
... ... @@ -1924,7 +1914,6 @@
1924 1914 * this new queue is RT and the current one is BE
1925 1915 */
1926 1916 cfq_preempt_queue(cfqd, cfqq);
1927   - cfq_mark_cfqq_must_dispatch(cfqq);
1928 1917 blk_start_queueing(cfqd->queue);
1929 1918 }
1930 1919 }
1931 1920  
... ... @@ -2201,10 +2190,8 @@
2201 2190 /*
2202 2191 * not expired and it has a request pending, let it dispatch
2203 2192 */
2204   - if (!RB_EMPTY_ROOT(&cfqq->sort_list)) {
2205   - cfq_mark_cfqq_must_dispatch(cfqq);
  2193 + if (!RB_EMPTY_ROOT(&cfqq->sort_list))
2206 2194 goto out_kick;
2207   - }
2208 2195 }
2209 2196 expire:
2210 2197 cfq_slice_expired(cfqd, timed_out);