Since commit 83cbce957446("block: add error handling for device_add_disk / add_disk"), bdev->bd_holder_dir can not be empty now, so remove WARN_ON() from bd_link_disk_holder.
Unified · Split
| @@ -79,10 +79,6 @@ int bd_link_disk_holder(struct block_device *bdev, struct gendisk *disk) · 78 unmodified lines | |||
| 79 | 79 | ||
| 80 | WARN_ON_ONCE(!bdev->bd_holder); | 80 | WARN_ON_ONCE(!bdev->bd_holder); |
| 81 | 81 | ||
| 82 | /* FIXME: remove the following once add_disk() handles errors */ | ||
| 83 | if (WARN_ON(!bdev->bd_holder_dir)) | ||
| 84 | goto out_unlock; | ||
| 85 | |||
| 86 | holder = bd_find_holder_disk(bdev, disk); | 82 | holder = bd_find_holder_disk(bdev, disk); |
| 87 | if (holder) { | 83 | if (holder) { |
| 88 | holder->refcnt++; | 84 | holder->refcnt++; |