git: 5d9c2687c3c8 - stable/13 - pms(4): Stop checking for failures from malloc(M_WAITOK)
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 30 Sep 2024 05:08:34 UTC
The branch stable/13 has been updated by zlei:
URL: https://cgit.FreeBSD.org/src/commit/?id=5d9c2687c3c89e5cff9b76fc88f5417c6651354c
commit 5d9c2687c3c89e5cff9b76fc88f5417c6651354c
Author: Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:32 +0000
Commit: Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-30 05:05:38 +0000
pms(4): Stop checking for failures from malloc(M_WAITOK)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D45852
(cherry picked from commit 4fb8a80a78aa65e0b30bd5a74373512c678841c9)
(cherry picked from commit 025c4754941956e24830a9c3c6f5e2466b19a9e1)
---
sys/dev/pms/freebsd/driver/ini/src/agtiapi.c | 38 +++-------------------------
1 file changed, 4 insertions(+), 34 deletions(-)
diff --git a/sys/dev/pms/freebsd/driver/ini/src/agtiapi.c b/sys/dev/pms/freebsd/driver/ini/src/agtiapi.c
index 3368897d1d19..29290ec94ec7 100644
--- a/sys/dev/pms/freebsd/driver/ini/src/agtiapi.c
+++ b/sys/dev/pms/freebsd/driver/ini/src/agtiapi.c
@@ -318,13 +318,6 @@ int agtiapi_getdevlist( struct agtiapi_softc *pCard,
sizeof(void *) );
AGTIAPI_PRINTK("agtiapi_getdevlist: portCount %d\n", pCard->portCount);
devList = malloc(memNeeded1, TEMP2, M_WAITOK);
- if (devList == NULL)
- {
- AGTIAPI_PRINTK("agtiapi_getdevlist: failed to allocate memory\n");
- ret_val = IOCTL_CALL_FAIL;
- agIOCTLPayload->Status = IOCTL_ERR_STATUS_INTERNAL_ERROR;
- return ret_val;
- }
osti_memset(devList, 0, memNeeded1);
pPortalData = &pCard->pPortalData[0];
pDeviceHandleList = (bit8*)devList;
@@ -968,13 +961,8 @@ static int agtiapi_attach( device_t devx )
}
else
{
- pmsc->pPortalData = (ag_portal_data_t *)
- malloc( sizeof(ag_portal_data_t) * pmsc->portCount,
+ pmsc->pPortalData = malloc( sizeof(ag_portal_data_t) * pmsc->portCount,
M_PMC_MPRT, M_ZERO | M_WAITOK );
- if (pmsc->pPortalData == NULL)
- {
- AGTIAPI_PRINTK( "agtiapi_attach: Portal memory allocation ERROR\n" );
- }
}
pPortalData = pmsc->pPortalData;
@@ -1225,32 +1213,14 @@ STATIC agBOOLEAN agtiapi_InitCardHW( struct agtiapi_softc *pmsc )
pmsc->flags |= AGTIAPI_SYS_INTR_ON;
numVal = sizeof(ag_device_t) * pmsc->devDiscover;
- pmsc->pDevList =
- (ag_device_t *)malloc( numVal, M_PMC_MDVT, M_ZERO | M_WAITOK );
- if( !pmsc->pDevList ) {
- AGTIAPI_PRINTK( "agtiapi_InitCardHW: kmalloc %d DevList ERROR\n", numVal );
- panic( "agtiapi_InitCardHW\n" );
- return AGTIAPI_FAIL;
- }
+ pmsc->pDevList = malloc( numVal, M_PMC_MDVT, M_ZERO | M_WAITOK );
#ifdef LINUX_PERBI_SUPPORT
numVal = sizeof(ag_slr_map_t) * pmsc->devDiscover;
- pmsc->pSLRList =
- (ag_slr_map_t *)malloc( numVal, M_PMC_MSLR, M_ZERO | M_WAITOK );
- if( !pmsc->pSLRList ) {
- AGTIAPI_PRINTK( "agtiapi_InitCardHW: kmalloc %d SLRList ERROR\n", numVal );
- panic( "agtiapi_InitCardHW SLRL\n" );
- return AGTIAPI_FAIL;
- }
+ pmsc->pSLRList = malloc( numVal, M_PMC_MSLR, M_ZERO | M_WAITOK );
numVal = sizeof(ag_tgt_map_t) * pmsc->devDiscover;
- pmsc->pWWNList =
- (ag_tgt_map_t *)malloc( numVal, M_PMC_MTGT, M_ZERO | M_WAITOK );
- if( !pmsc->pWWNList ) {
- AGTIAPI_PRINTK( "agtiapi_InitCardHW: kmalloc %d WWNList ERROR\n", numVal );
- panic( "agtiapi_InitCardHW WWNL\n" );
- return AGTIAPI_FAIL;
- }
+ pmsc->pWWNList = malloc( numVal, M_PMC_MTGT, M_ZERO | M_WAITOK );
// Get the WWN_to_target_ID mappings from the
// holding area which contains the input of the