2 more btrfs patches for device handling