aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/iscsi
diff options
context:
space:
mode:
authorEdward Tomasz Napierala <trasz@FreeBSD.org>2014-11-03 11:15:51 +0000
committerEdward Tomasz Napierala <trasz@FreeBSD.org>2014-11-03 11:15:51 +0000
commitd2d52b00136d3c7f31d6ef19b43f4b0479c5ebe3 (patch)
tree13f4a7cde3699ea1ba57afddbe417afe9075ba5b /sys/dev/iscsi
parent775fcb6e6369bb2a59b9643e7bb0ae32215d0479 (diff)
downloadsrc-d2d52b00136d3c7f31d6ef19b43f4b0479c5ebe3.tar.gz
src-d2d52b00136d3c7f31d6ef19b43f4b0479c5ebe3.zip
Notes
Diffstat (limited to 'sys/dev/iscsi')
-rw-r--r--sys/dev/iscsi/icl.c2
-rw-r--r--sys/dev/iscsi/icl.h2
-rw-r--r--sys/dev/iscsi/iscsi.c14
3 files changed, 9 insertions, 9 deletions
diff --git a/sys/dev/iscsi/icl.c b/sys/dev/iscsi/icl.c
index 721454de3243..f56e494fea7e 100644
--- a/sys/dev/iscsi/icl.c
+++ b/sys/dev/iscsi/icl.c
@@ -188,7 +188,7 @@ icl_pdu_free(struct icl_pdu *ip)
* Allocate icl_pdu with empty BHS to fill up by the caller.
*/
struct icl_pdu *
-icl_pdu_new_bhs(struct icl_conn *ic, int flags)
+icl_pdu_new(struct icl_conn *ic, int flags)
{
struct icl_pdu *ip;
diff --git a/sys/dev/iscsi/icl.h b/sys/dev/iscsi/icl.h
index ca5ee8f704b1..50b231ef6996 100644
--- a/sys/dev/iscsi/icl.h
+++ b/sys/dev/iscsi/icl.h
@@ -57,7 +57,7 @@ struct icl_pdu {
uint32_t ip_prv2;
};
-struct icl_pdu *icl_pdu_new_bhs(struct icl_conn *ic, int flags);
+struct icl_pdu *icl_pdu_new(struct icl_conn *ic, int flags);
size_t icl_pdu_data_segment_length(const struct icl_pdu *ip);
int icl_pdu_append_data(struct icl_pdu *ip, const void *addr, size_t len, int flags);
void icl_pdu_get_data(struct icl_pdu *ip, size_t off, void *addr, size_t len);
diff --git a/sys/dev/iscsi/iscsi.c b/sys/dev/iscsi/iscsi.c
index c36c010764a0..89f4436daf6b 100644
--- a/sys/dev/iscsi/iscsi.c
+++ b/sys/dev/iscsi/iscsi.c
@@ -266,7 +266,7 @@ iscsi_session_logout(struct iscsi_session *is)
struct icl_pdu *request;
struct iscsi_bhs_logout_request *bhslr;
- request = icl_pdu_new_bhs(is->is_conn, M_NOWAIT);
+ request = icl_pdu_new(is->is_conn, M_NOWAIT);
if (request == NULL)
return;
@@ -585,7 +585,7 @@ iscsi_callout(void *context)
if (is->is_timeout < 2)
return;
- request = icl_pdu_new_bhs(is->is_conn, M_NOWAIT);
+ request = icl_pdu_new(is->is_conn, M_NOWAIT);
if (request == NULL) {
ISCSI_SESSION_WARN(is, "failed to allocate PDU");
return;
@@ -789,7 +789,7 @@ iscsi_pdu_handle_nop_in(struct icl_pdu *response)
icl_pdu_get_data(response, 0, data, datasize);
}
- request = icl_pdu_new_bhs(response->ip_conn, M_NOWAIT);
+ request = icl_pdu_new(response->ip_conn, M_NOWAIT);
if (request == NULL) {
ISCSI_SESSION_WARN(is, "failed to allocate memory; "
"reconnecting");
@@ -1150,7 +1150,7 @@ iscsi_pdu_handle_r2t(struct icl_pdu *response)
return;
}
- request = icl_pdu_new_bhs(response->ip_conn, M_NOWAIT);
+ request = icl_pdu_new(response->ip_conn, M_NOWAIT);
if (request == NULL) {
icl_pdu_free(response);
iscsi_session_reconnect(is);
@@ -1554,7 +1554,7 @@ iscsi_ioctl_daemon_send(struct iscsi_softc *sc,
}
}
- ip = icl_pdu_new_bhs(is->is_conn, M_WAITOK);
+ ip = icl_pdu_new(is->is_conn, M_WAITOK);
memcpy(ip->ip_bhs, ids->ids_bhs, sizeof(*ip->ip_bhs));
if (datalen > 0) {
error = icl_pdu_append_data(ip, data, datalen, M_WAITOK);
@@ -2004,7 +2004,7 @@ iscsi_action_abort(struct iscsi_session *is, union ccb *ccb)
return;
}
- request = icl_pdu_new_bhs(is->is_conn, M_NOWAIT);
+ request = icl_pdu_new(is->is_conn, M_NOWAIT);
if (request == NULL) {
ccb->ccb_h.status = CAM_RESRC_UNAVAIL;
xpt_done(ccb);
@@ -2058,7 +2058,7 @@ iscsi_action_scsiio(struct iscsi_session *is, union ccb *ccb)
}
#endif
- request = icl_pdu_new_bhs(is->is_conn, M_NOWAIT);
+ request = icl_pdu_new(is->is_conn, M_NOWAIT);
if (request == NULL) {
if ((ccb->ccb_h.status & CAM_DEV_QFRZN) == 0) {
xpt_freeze_devq(ccb->ccb_h.path, 1);