> if (op_is_flush(bio->bi_opf) && > - !test_bit(QUEUE_FLAG_WC, &q->queue_flags)) { > + !blk_queue_wb_cached(q)) { The formatting is wrong here. And I really think these helpers do nothing but obsfucating the code. Now instead of a grep telling me exactly what is going on I now need to walk through the macro first. (nevermind that this particular one is also horribly misnamed).