block/cfq: update to 3.1
cfq: temporarily dirty workaround to fix build error