Add checks to avoid adding the same device twice during mkfs