rbd: ensure dev_file and dev_bus are never referenced before they are set
merge more fixes from master