• Tejun Heo's avatar
    cfq-iosched: fold cfq_find_alloc_queue() into cfq_get_queue() · d4aad7ff
    Tejun Heo authored
    cfq_find_alloc_queue() checks whether a queue actually needs to be
    allocated, which is unnecessary as its sole caller, cfq_get_queue(),
    only calls it if so.  Also, the oom queue fallback logic is scattered
    between cfq_get_queue() and cfq_find_alloc_queue().  There really
    isn't much going on in the latter and things can be made simpler by
    folding it into cfq_get_queue().
    
    This patch collapses cfq_find_alloc_queue() into cfq_get_queue().  The
    change is fairly straight-forward with one exception - async_cfqq is
    now initialized to NULL and the "!is_sync" test in the last if
    conditional is replaced with "async_cfqq" test.  This is because gcc
    (5.1.1) gets confused for some reason and warns that async_cfqq may be
    used uninitialized otherwise.  Oh well, the code isn't necessarily
    worse this way.
    
    This patch doesn't cause any functional difference.
    
    v2: Updated to reflect GFP_ATOMIC -> GPF_NOWAIT.
    Signed-off-by: default avatarTejun Heo <tj@kernel.org>
    Reviewed-by: default avatarJeff Moyer <jmoyer@redhat.com>
    Cc: Vivek Goyal <vgoyal@redhat.com>
    Cc: Arianna Avanzini <avanzini.arianna@gmail.com>
    Signed-off-by: default avatarJens Axboe <axboe@fb.com>
    d4aad7ff
cfq-iosched.c 121 KB