diff options
author | mav <mav@FreeBSD.org> | 2015-01-03 13:36:56 +0000 |
---|---|---|
committer | mav <mav@FreeBSD.org> | 2015-01-03 13:36:56 +0000 |
commit | 57b1ef3ed0fa22177ac991f95c10b0572285f842 (patch) | |
tree | 4802883cf60ae9f6d90c069a1fec1e18f86c3500 /sys/dev | |
parent | 1fe3d1bb1e10c5209f4b4f7519968a9a556149c2 (diff) | |
download | FreeBSD-src-57b1ef3ed0fa22177ac991f95c10b0572285f842.zip FreeBSD-src-57b1ef3ed0fa22177ac991f95c10b0572285f842.tar.gz |
MFC r274036 (by trasz):
s/icl_pdu_new_bhs/icl_pdu_new/; no functional changes, just a little
nicer code.
Diffstat (limited to 'sys/dev')
-rw-r--r-- | sys/dev/iscsi/icl.c | 2 | ||||
-rw-r--r-- | sys/dev/iscsi/icl.h | 2 | ||||
-rw-r--r-- | sys/dev/iscsi/iscsi.c | 14 |
3 files changed, 9 insertions, 9 deletions
diff --git a/sys/dev/iscsi/icl.c b/sys/dev/iscsi/icl.c index 476f5dc..5c84c64 100644 --- a/sys/dev/iscsi/icl.c +++ b/sys/dev/iscsi/icl.c @@ -193,7 +193,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 ca5ee8f..50b231e 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 ed49835..e4f736c 100644 --- a/sys/dev/iscsi/iscsi.c +++ b/sys/dev/iscsi/iscsi.c @@ -274,7 +274,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; @@ -593,7 +593,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; @@ -811,7 +811,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"); @@ -1179,7 +1179,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); @@ -1583,7 +1583,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); @@ -2067,7 +2067,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); @@ -2121,7 +2121,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); |