summaryrefslogtreecommitdiff
path: root/net/netlabel
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2015-08-18 14:55:04 -0700
committerJens Axboe <axboe@fb.com>2015-08-18 15:49:16 -0700
commitd4aad7ff04dfd00f2a69356a48054d6be84dda31 (patch)
treed1e9b3a0300ff41f977ae790b6d91fb557ac5093 /net/netlabel
parent322731ed0dd2d8a7f11307e0444257f48580a0de (diff)
cfq-iosched: fold cfq_find_alloc_queue() into cfq_get_queue()
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: Tejun Heo <tj@kernel.org> Reviewed-by: Jeff Moyer <jmoyer@redhat.com> Cc: Vivek Goyal <vgoyal@redhat.com> Cc: Arianna Avanzini <avanzini.arianna@gmail.com> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'net/netlabel')
0 files changed, 0 insertions, 0 deletions