i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Small cleanup. Now bails out if locked_pool couldn't allocate another chunk.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8283 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2004-07-02 19:09:30 +00:00
parent 1f5d3007c4
commit d448e270d8
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/bus_managers/scsi/scatter_gather.c
+16 -8
View File
@@ -105,6 +105,10 @@ create_temp_sg(scsi_ccb *ccb)
SHOW_FLOW(3, "ccb=%p, data=%p, data_len=%lu", ccb, ccb->data, ccb->data_len);
ccb->sg_list = temp_sg = locked_pool->alloc(temp_sg_pool);
if (temp_sg == NULL) {
SHOW_ERROR0(2, "cannot allocate memory for IO request!");
return false;
}
res = lock_memory(ccb->data, ccb->data_len, B_DMA_IO
| ((ccb->flags & SCSI_DIR_MASK) == SCSI_DIR_IN ? B_READ_DEVICE : 0));
@@ -127,15 +131,19 @@ err:
}
// cleanup temporary SG list
void uninit_temp_sg( void )
/** cleanup temporary SG list */
void
uninit_temp_sg(void)
{
locked_pool->destroy( temp_sg_pool );
locked_pool->destroy(temp_sg_pool);
}
// destroy SG list buffer
void cleanup_tmp_sg( scsi_ccb *ccb )
/** destroy SG list buffer */
void
cleanup_tmp_sg(scsi_ccb *ccb)
{
status_t res;
@@ -143,15 +151,15 @@ void cleanup_tmp_sg( scsi_ccb *ccb )
ccb, ccb->data, (int)ccb->data_len );
res = unlock_memory( ccb->data, ccb->data_len, B_DMA_IO |
( (ccb->flags & SCSI_DIR_MASK) == SCSI_DIR_IN ? B_READ_DEVICE : 0 ));
((ccb->flags & SCSI_DIR_MASK) == SCSI_DIR_IN ? B_READ_DEVICE : 0));
if (res != B_OK) {
SHOW_FLOW0(3, "Cannot unlock previously locked memory!");
panic("Cannot unlock previously locked memory!");
}
locked_pool->free(temp_sg_pool, (physical_entry *)ccb->sg_list);
// restore previous state
ccb->sg_list = NULL;
}