floppy: address add_disk() error handling on probe
We need to cleanup resources on the probe() callback registered with __register_blkdev(), now that add_disk() error handling is supported. Address this. Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Luis Chamberlain <mcgrof@kernel.org> Link: https://lore.kernel.org/r/20211103230437.1639990-14-mcgrof@kernel.org Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Родитель
46a7db492e
Коммит
ec28fcc6cf
|
@ -4528,10 +4528,19 @@ static void floppy_probe(dev_t dev)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
mutex_lock(&floppy_probe_lock);
|
mutex_lock(&floppy_probe_lock);
|
||||||
if (!disks[drive][type]) {
|
if (disks[drive][type])
|
||||||
if (floppy_alloc_disk(drive, type) == 0)
|
goto out;
|
||||||
add_disk(disks[drive][type]);
|
if (floppy_alloc_disk(drive, type))
|
||||||
}
|
goto out;
|
||||||
|
if (add_disk(disks[drive][type]))
|
||||||
|
goto cleanup_disk;
|
||||||
|
out:
|
||||||
|
mutex_unlock(&floppy_probe_lock);
|
||||||
|
return;
|
||||||
|
|
||||||
|
cleanup_disk:
|
||||||
|
blk_cleanup_disk(disks[drive][type]);
|
||||||
|
disks[drive][type] = NULL;
|
||||||
mutex_unlock(&floppy_probe_lock);
|
mutex_unlock(&floppy_probe_lock);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче