From 2b28476ccc00a59a6f8dc671e9c0f845d0fe8c94 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Fri, 19 Jan 2007 11:35:30 +1100 Subject: [PATCH] --- yaml --- r: 47871 b: refs/heads/master c: b0b8d74941b7bc67edec26e4c114d27827edfd09 h: refs/heads/master i: 47869: 4e9b5aa14f708a4fc5fd61f307df5ed87eb62abc 47867: b4f8f22fa23b7d1bc9030042b5672ad4a3b05fdf 47863: 7fd1dbf0632be80d2226f6609b30162a9ae26b99 47855: 30ab74ecd644a62b6a6eab3188c41866708f7daf 47839: 0d982f336006129fd5124b044d4a2129df9497bf 47807: dbae77ea17ef935c220e0196bb995db400a70dab 47743: 3b1bb3d534c4f89a35808c9f0c82dad8851af62d 47615: a8b5a4b9e3565e2f584a731ffaeedfb42eca7ed4 v: v3 --- [refs] | 2 +- trunk/block/cfq-iosched.c | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index e0f27e50bb93..925d6563c0fb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 98e41c7dfc90c0e9a1086502d4c4d367e1ad74db +refs/heads/master: b0b8d74941b7bc67edec26e4c114d27827edfd09 diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c index 4c24986151ba..975cdfc8d614 100644 --- a/trunk/block/cfq-iosched.c +++ b/trunk/block/cfq-iosched.c @@ -162,15 +162,15 @@ struct cfq_queue { }; enum cfqq_state_flags { - CFQ_CFQQ_FLAG_on_rr = 0, - CFQ_CFQQ_FLAG_wait_request, - CFQ_CFQQ_FLAG_must_alloc, - CFQ_CFQQ_FLAG_must_alloc_slice, - CFQ_CFQQ_FLAG_must_dispatch, - CFQ_CFQQ_FLAG_fifo_expire, - CFQ_CFQQ_FLAG_idle_window, - CFQ_CFQQ_FLAG_prio_changed, - CFQ_CFQQ_FLAG_queue_new, + CFQ_CFQQ_FLAG_on_rr = 0, /* on round-robin busy list */ + CFQ_CFQQ_FLAG_wait_request, /* waiting for a request */ + CFQ_CFQQ_FLAG_must_alloc, /* must be allowed rq alloc */ + CFQ_CFQQ_FLAG_must_alloc_slice, /* per-slice must_alloc flag */ + CFQ_CFQQ_FLAG_must_dispatch, /* must dispatch, even if expired */ + CFQ_CFQQ_FLAG_fifo_expire, /* FIFO checked in this slice */ + CFQ_CFQQ_FLAG_idle_window, /* slice idling enabled */ + CFQ_CFQQ_FLAG_prio_changed, /* task priority has changed */ + CFQ_CFQQ_FLAG_queue_new, /* queue never been serviced */ }; #define CFQ_CFQQ_FNS(name) \