1 files changed, 13 insertions, 13 deletions

diff --git a/sys/dev/isp/isp_target.c b/sys/dev/isp/isp_target.c
index 51b78fb8fd72b..8f49c32ff21ae 100644
--- a/sys/dev/isp/isp_target.c
+++ b/sys/dev/isp/isp_target.c
@@ -460,7 +460,7 @@ isp_endcmd(struct ispsoftc *isp, void *arg, u_int32_t code, u_int16_t hdl)
 			cto->rsp.m1.ct_senselen = 16;
 			cto->ct_flags |= CT2_SNSLEN_VALID;
 		}
-		cto->ct_reserved = hdl;
+		cto->ct_syshandle = hdl;
 	} else {
 		at_entry_t *aep = arg;
 		ct_entry_t *cto = &un._ctio;
@@ -478,7 +478,7 @@ isp_endcmd(struct ispsoftc *isp, void *arg, u_int32_t code, u_int16_t hdl)
 			cto->ct_flags |= CT_CCINCR;
 		}
 		cto->ct_scsi_status = sts;
-		cto->ct_reserved = hdl;
+		cto->ct_syshandle = hdl;
 	}
 	return (isp_target_put_entry(isp, &un));
 }
@@ -872,12 +872,12 @@ isp_handle_ctio(isp, ct)
 	struct ispsoftc *isp;
 	ct_entry_t *ct;
 {
-	XS_T *xs;
+	void *xs;
 	int pl = ISP_LOGTDEBUG2;
 	char *fmsg = NULL;
 
-	if (ct->ct_reserved) {
-		xs = isp_find_xs(isp, ct->ct_reserved);
+	if (ct->ct_syshandle) {
+		xs = isp_find_xs(isp, ct->ct_syshandle);
 		if (xs == NULL)
 			pl = ISP_LOGALL;
 	} else {
@@ -1005,7 +1005,7 @@ isp_handle_ctio(isp, ct)
 		 * The assumption is that they'll all be returned in the
 		 * order we got them.
 		 */
-		if (ct->ct_reserved == 0) {
+		if (ct->ct_syshandle == 0) {
 			if ((ct->ct_flags & CT_SENDSTATUS) == 0) {
 				isp_prt(isp, pl,
 				    "intermediate CTIO completed ok");
@@ -1016,7 +1016,7 @@ isp_handle_ctio(isp, ct)
 		} else {
 			isp_prt(isp, pl,
 			    "NO xs for CTIO (handle 0x%x) status 0x%x",
-			    ct->ct_reserved, ct->ct_status & ~QLTM_SVALID);
+			    ct->ct_syshandle, ct->ct_status & ~QLTM_SVALID);
 		}
 	} else {
 		if (ct->ct_flags & CT_SENDSTATUS) {
@@ -1035,7 +1035,7 @@ isp_handle_ctio(isp, ct)
 			 * notify platform dependent layers.
 			 */
 			isp_prt(isp, pl, "data CTIO complete");
-			ISP_DMAFREE(isp, xs, ct->ct_reserved);
+			ISP_DMAFREE(isp, xs, ct->ct_syshandle);
 		}
 		(void) isp_async(isp, ISPASYNC_TARGET_ACTION, ct);
 		/*
@@ -1053,8 +1053,8 @@ isp_handle_ctio2(isp, ct)
 	int pl = ISP_LOGTDEBUG2;
 	char *fmsg = NULL;
 
-	if (ct->ct_reserved) {
-		xs = isp_find_xs(isp, ct->ct_reserved);
+	if (ct->ct_syshandle) {
+		xs = isp_find_xs(isp, ct->ct_syshandle);
 		if (xs == NULL)
 			pl = ISP_LOGALL;
 	} else {
@@ -1185,7 +1185,7 @@ isp_handle_ctio2(isp, ct)
 		 * The assumption is that they'll all be returned in the
 		 * order we got them.
 		 */
-		if (ct->ct_reserved == 0) {
+		if (ct->ct_syshandle == 0) {
 			if ((ct->ct_flags & CT_SENDSTATUS) == 0) {
 				isp_prt(isp, pl,
 				    "intermediate CTIO completed ok");
@@ -1196,7 +1196,7 @@ isp_handle_ctio2(isp, ct)
 		} else {
 			isp_prt(isp, pl,
 			    "NO xs for CTIO (handle 0x%x) status 0x%x",
-			    ct->ct_reserved, ct->ct_status & ~QLTM_SVALID);
+			    ct->ct_syshandle, ct->ct_status & ~QLTM_SVALID);
 		}
 	} else {
 		if (ct->ct_flags & CT_SENDSTATUS) {
@@ -1215,7 +1215,7 @@ isp_handle_ctio2(isp, ct)
 			 * notify platform dependent layers.
 			 */
 			isp_prt(isp, pl, "data CTIO complete");
-			ISP_DMAFREE(isp, xs, ct->ct_reserved);
+			ISP_DMAFREE(isp, xs, ct->ct_syshandle);
 		}
 		(void) isp_async(isp, ISPASYNC_TARGET_ACTION, ct);
 		/*