david/ipxe
david
/
ipxe
Archived
1
0
Fork 0
Code

[block] Gracefully close SAN device if registration fails 

Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown 2017-03-27 16:56:36 +03:00
parent ee35b03583
commit 539088a27b
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/core/sanboot.c
View File

@ -733,7 +733,8 @@ int register_sandev ( struct san_device *sandev ) {
/* Check that drive number is not in use */ /* Check that drive number is not in use */
if ( sandev_find ( sandev->drive ) != NULL ) { if ( sandev_find ( sandev->drive ) != NULL ) {
DBGC ( sandev, "SAN %#02x is already in use\n", sandev->drive ); DBGC ( sandev, "SAN %#02x is already in use\n", sandev->drive );
return -EADDRINUSE; rc = -EADDRINUSE;
goto err_in_use;
} }
/* Check that device is capable of being opened (i.e. that all /* Check that device is capable of being opened (i.e. that all
@ -741,22 +742,30 @@ int register_sandev ( struct san_device *sandev ) {
* working). * working).
*/ */
if ( ( rc = sandev_reopen ( sandev ) ) != 0 ) if ( ( rc = sandev_reopen ( sandev ) ) != 0 )
return rc; goto err_reopen;
/* Read device capacity */ /* Read device capacity */
if ( ( rc = sandev_command ( sandev, sandev_command_read_capacity, if ( ( rc = sandev_command ( sandev, sandev_command_read_capacity,
NULL ) ) != 0 ) NULL ) ) != 0 )
return rc; goto err_capacity;
/* Configure as a CD-ROM, if applicable */ /* Configure as a CD-ROM, if applicable */
if ( ( rc = sandev_parse_iso9660 ( sandev ) ) != 0 ) if ( ( rc = sandev_parse_iso9660 ( sandev ) ) != 0 )
return rc; goto err_iso9660;
/* Add to list of SAN devices */ /* Add to list of SAN devices */
list_add_tail ( &sandev->list, &san_devices ); list_add_tail ( &sandev->list, &san_devices );
DBGC ( sandev, "SAN %#02x registered\n", sandev->drive ); DBGC ( sandev, "SAN %#02x registered\n", sandev->drive );
return 0; return 0;
list_del ( &sandev->list );
err_iso9660:
err_capacity:
err_reopen:
sandev_restart ( sandev, rc );
err_in_use:
return rc;
} }
/** /**
@ -769,11 +778,12 @@ void unregister_sandev ( struct san_device *sandev ) {
/* Sanity check */ /* Sanity check */
assert ( ! timer_running ( &sandev->timer ) ); assert ( ! timer_running ( &sandev->timer ) );
/* Remove from list of SAN devices */
list_del ( &sandev->list );
/* Shut down interfaces */ /* Shut down interfaces */
sandev_restart ( sandev, 0 ); sandev_restart ( sandev, 0 );
/* Remove from list of SAN devices */
list_del ( &sandev->list );
DBGC ( sandev, "SAN %#02x unregistered\n", sandev->drive ); DBGC ( sandev, "SAN %#02x unregistered\n", sandev->drive );
} }