Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e00ef799 authored by Jens Axboe's avatar Jens Axboe
Browse files

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: default avatarJens Axboe <jens.axboe@oracle.com>
parent 125c4f22

block/cfq-iosched.c

+2 −19
Original line number Original line Diff line number Diff line
@@ -253,7 +253,6 @@ enum cfqq_state_flags { 
	CFQ_CFQQ_FLAG_slice_new,	/* no requests dispatched in slice */

	CFQ_CFQQ_FLAG_slice_new,	/* no requests dispatched in slice */

	CFQ_CFQQ_FLAG_sync,		/* synchronous queue */

	CFQ_CFQQ_FLAG_sync,		/* synchronous queue */

	CFQ_CFQQ_FLAG_coop,		/* cfqq is shared */

	CFQ_CFQQ_FLAG_coop,		/* cfqq is shared */

	CFQ_CFQQ_FLAG_coop_preempt,	/* coop preempt */

};

};





#define CFQ_CFQQ_FNS(name)						\

#define CFQ_CFQQ_FNS(name)						\
@@ -280,7 +279,6 @@ CFQ_CFQQ_FNS(prio_changed); 
CFQ_CFQQ_FNS(slice_new);

CFQ_CFQQ_FNS(slice_new);

CFQ_CFQQ_FNS(sync);

CFQ_CFQQ_FNS(sync);

CFQ_CFQQ_FNS(coop);

CFQ_CFQQ_FNS(coop);

CFQ_CFQQ_FNS(coop_preempt);

#undef CFQ_CFQQ_FNS

#undef CFQ_CFQQ_FNS





#define cfq_log_cfqq(cfqd, cfqq, fmt, args...)	\

#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,

static struct cfq_queue *cfq_set_active_queue(struct cfq_data *cfqd,

					      struct cfq_queue *cfqq)

					      struct cfq_queue *cfqq)

{

{

	if (!cfqq) {

	if (!cfqq)

		cfqq = cfq_get_next_queue(cfqd);

		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);

	__cfq_set_active_queue(cfqd, cfqq);

	return 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

	 * if this request is as-good as one we would expect from the

	 * current cfqq, let it preempt

	 * current cfqq, let it preempt

	 */

	 */

	if (cfq_rq_close(cfqd, cfqq, rq) && (!cfq_cfqq_coop(new_cfqq) ||

	if (cfq_rq_close(cfqd, cfqq, rq))

	    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);

		return true;

		return true;

	}





	return false;

	return false;

}

}