[disk] Put the device structure right in the disk structure