block: fiops: merge upstream from 3.10 Linux

thanks to faux123

Signed-off-by: engstk <eng.stk@sapo.pt>