For some odd reason, the blkdev.h changes did not get patched into your
tree from the patch I sent?! Anyways, here's that change: