block, bfq: remove batches of confusing ifdefs
authorPaolo Valente <paolo.valente@linaro.org>
Mon, 4 Dec 2017 10:42:05 +0000 (11:42 +0100)
committerJens Axboe <axboe@kernel.dk>
Fri, 5 Jan 2018 16:32:59 +0000 (09:32 -0700)
commit9b25bd0368d562d1929059e8eb9de4102567b923
treeec28af9f679cb63cceb189530c75e02fb7ece769
parenta34b024448eb71b0e51ad011fa1862236e366034
block, bfq: remove batches of confusing ifdefs

Commit a33801e8b473 ("block, bfq: move debug blkio stats behind
CONFIG_DEBUG_BLK_CGROUP") introduced two batches of confusing ifdefs:
one reported in [1], plus a similar one in another function. This
commit removes both batches, in the way suggested in [1].

[1] https://www.spinics.net/lists/linux-block/msg20043.html

Fixes: a33801e8b473 ("block, bfq: move debug blkio stats behind CONFIG_DEBUG_BLK_CGROUP")
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Tested-by: Luca Miccio <lucmiccio@gmail.com>
Signed-off-by: Paolo Valente <paolo.valente@linaro.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/bfq-iosched.c