blkcg: stop iteration early if root_rl is the only request list
authorJun'ichi Nomura <j-nomura@ce.jp.nec.com>
Mon, 22 Oct 2012 01:15:37 +0000 (10:15 +0900)
committerJens Axboe <axboe@kernel.dk>
Mon, 22 Oct 2012 20:00:26 +0000 (22:00 +0200)
__blk_queue_next_rl() finds next request list based on blkg_list
while skipping root_blkg in the list.
OTOH, root_rl is special as it may exist even without root_blkg.

Though the later part of the function handles such a case correctly,
exiting early is good for readability of the code.

Signed-off-by: Jun'ichi Nomura <j-nomura@ce.jp.nec.com>
Cc: Tejun Heo <tj@kernel.org>
Acked-by: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/blk-cgroup.c

index 3ad5e3fbf579ee1ea2239f519fec4aea6d80d1b7..d0b770391ad400ad0312049c84a2b522bf985bf1 100644 (file)
@@ -333,6 +333,9 @@ struct request_list *__blk_queue_next_rl(struct request_list *rl,
         */
        if (rl == &q->root_rl) {
                ent = &q->blkg_list;
+               /* There are no more block groups, hence no request lists */
+               if (list_empty(ent))
+                       return NULL;
        } else {
                blkg = container_of(rl, struct blkcg_gq, rl);
                ent = &blkg->q_node;