cfq-iosched: get rid of the coop_preempt flag

We need to rework this logic post the cooperating cfq_queue merging,
for now just get rid of it and Jeff Moyer will fix the fall out.

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

diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index b700f41cafb30e67ebff900627d93b545989a8c6..4ab240c875df3a39d587087ce248faf7272ca8f2 100644 (file)
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -253,7 +253,6 @@ enum cfqq_state_flags {
        CFQ_CFQQ_FLAG_slice_new,        /* no requests dispatched in slice */
        CFQ_CFQQ_FLAG_sync,             /* synchronous queue */
        CFQ_CFQQ_FLAG_coop,             /* cfqq is shared */
-       CFQ_CFQQ_FLAG_coop_preempt,     /* coop preempt */
 };
 
 #define CFQ_CFQQ_FNS(name)                                             \
@@ -280,7 +279,6 @@ CFQ_CFQQ_FNS(prio_changed);
 CFQ_CFQQ_FNS(slice_new);
 CFQ_CFQQ_FNS(sync);
 CFQ_CFQQ_FNS(coop);
-CFQ_CFQQ_FNS(coop_preempt);
 #undef CFQ_CFQQ_FNS
 
 #define cfq_log_cfqq(cfqd, cfqq, fmt, args...) \
@@ -1070,16 +1068,9 @@ static struct cfq_queue *cfq_get_next_queue(struct cfq_data *cfqd)
 static struct cfq_queue *cfq_set_active_queue(struct cfq_data *cfqd,
                                              struct cfq_queue *cfqq)
 {
-       if (!cfqq) {
+       if (!cfqq)
                cfqq = cfq_get_next_queue(cfqd);
 
-               if (cfqq && !cfq_cfqq_coop_preempt(cfqq))
-                       cfq_clear_cfqq_coop(cfqq);
-       }
-
-       if (cfqq)
-               cfq_clear_cfqq_coop_preempt(cfqq);
-
        __cfq_set_active_queue(cfqd, cfqq);
        return cfqq;
 }
@@ -2433,16 +2424,8 @@ cfq_should_preempt(struct cfq_data *cfqd, struct cfq_queue *new_cfqq,
         * if this request is as-good as one we would expect from the
         * current cfqq, let it preempt
         */
-       if (cfq_rq_close(cfqd, cfqq, rq) && (!cfq_cfqq_coop(new_cfqq) ||
-           cfqd->busy_queues == 1)) {
-               /*
-                * Mark new queue coop_preempt, so its coop flag will not be
-                * cleared when new queue gets scheduled at the very first time
-                */
-               cfq_mark_cfqq_coop_preempt(new_cfqq);
-               cfq_mark_cfqq_coop(new_cfqq);
+       if (cfq_rq_close(cfqd, cfqq, rq))
                return true;
-       }
 
        return false;
 }