d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't leak memory when removing an unconnected session, and remove useless

Browse Source 
UMA_ZONE_NOFREE that caused another leak when unloading the module.

Approved by:	re (glebius)
Sponsored by:	FreeBSD Foundation
This commit is contained in:
trasz 2013-10-04 19:31:41 +00:00
parent 56fd486581
commit cf59042d5a
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/cam/ctl/ctl_frontend_iscsi.c
View File

@ -1255,7 +1255,7 @@ cfiscsi_init(void)
cfiscsi_data_wait_zone = uma_zcreate("cfiscsi_data_wait", cfiscsi_data_wait_zone = uma_zcreate("cfiscsi_data_wait",
sizeof(struct cfiscsi_data_wait), NULL, NULL, NULL, NULL, sizeof(struct cfiscsi_data_wait), NULL, NULL, NULL, NULL,
UMA_ALIGN_PTR, UMA_ZONE_NOFREE); UMA_ALIGN_PTR, 0);
return (0); return (0);

5
sys/dev/iscsi/icl.c
View File

@ -957,6 +957,7 @@ icl_pdu_queue(struct icl_pdu *ip)
if (ic->ic_disconnecting || ic->ic_socket == NULL) { if (ic->ic_disconnecting || ic->ic_socket == NULL) {
ICL_DEBUG("icl_pdu_queue on closed connection"); ICL_DEBUG("icl_pdu_queue on closed connection");
ICL_CONN_UNLOCK(ic); ICL_CONN_UNLOCK(ic);
icl_pdu_free(ip);
return; return;
} }
TAILQ_INSERT_TAIL(&ic->ic_to_send, ip, ip_next); TAILQ_INSERT_TAIL(&ic->ic_to_send, ip, ip_next);
@ -1259,10 +1260,10 @@ icl_load(void)
icl_conn_zone = uma_zcreate("icl_conn", icl_conn_zone = uma_zcreate("icl_conn",
sizeof(struct icl_conn), NULL, NULL, NULL, NULL, sizeof(struct icl_conn), NULL, NULL, NULL, NULL,
UMA_ALIGN_PTR, UMA_ZONE_NOFREE); UMA_ALIGN_PTR, 0);
icl_pdu_zone = uma_zcreate("icl_pdu", icl_pdu_zone = uma_zcreate("icl_pdu",
sizeof(struct icl_pdu), NULL, NULL, NULL, NULL, sizeof(struct icl_pdu), NULL, NULL, NULL, NULL,
UMA_ALIGN_PTR, UMA_ZONE_NOFREE); UMA_ALIGN_PTR, 0);
refcount_init(&icl_ncons, 0); refcount_init(&icl_ncons, 0);
} }

2
sys/dev/iscsi/iscsi.c
View File

@ -2030,7 +2030,7 @@ iscsi_load(void)
iscsi_outstanding_zone = uma_zcreate("iscsi_outstanding", iscsi_outstanding_zone = uma_zcreate("iscsi_outstanding",
sizeof(struct iscsi_outstanding), NULL, NULL, NULL, NULL, sizeof(struct iscsi_outstanding), NULL, NULL, NULL, NULL,
UMA_ALIGN_PTR, UMA_ZONE_NOFREE); UMA_ALIGN_PTR, 0);
error = make_dev_p(MAKEDEV_CHECKNAME, &sc->sc_cdev, &iscsi_cdevsw, error = make_dev_p(MAKEDEV_CHECKNAME, &sc->sc_cdev, &iscsi_cdevsw,
NULL, UID_ROOT, GID_WHEEL, 0600, "iscsi"); NULL, UID_ROOT, GID_WHEEL, 0600, "iscsi");