diff options
| -rw-r--r-- | share/examples/scsi_target/scsi_target.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/share/examples/scsi_target/scsi_target.c b/share/examples/scsi_target/scsi_target.c index ae5a8e4..c240686 100644 --- a/share/examples/scsi_target/scsi_target.c +++ b/share/examples/scsi_target/scsi_target.c @@ -184,12 +184,9 @@ cleanup() (void) ioctl(targfd, TARGIODEBUG, &debug); } close(targfd); - if (ioctl(targctlfd, TARGCTLIOFREEUNIT, &alloc_unit) == -1) { perror("TARGCTLIOFREEUNIT"); - exit(EX_SOFTWARE); } - close(targctlfd); } @@ -326,18 +323,22 @@ handle_exception() } bzero(&ccb, sizeof(ccb)); - cam_fill_ctio(&ccb.csio, /*retries*/2, + cam_fill_ctio(&ccb.csio, + /*retries*/2, /*cbfcnp*/NULL, - /*flags*/CAM_DIR_NONE - | (atio.ccb_h.flags & CAM_TAG_ACTION_VALID) - | CAM_SEND_STATUS, - /*tag_action*/MSG_SIMPLE_Q_TAG, + CAM_DIR_NONE | CAM_SEND_STATUS, + (atio.ccb_h.flags & CAM_TAG_ACTION_VALID)? + MSG_SIMPLE_Q_TAG : 0, atio.tag_id, atio.init_id, SCSI_STATUS_CHECK_COND, /*data_ptr*/NULL, /*dxfer_len*/0, /*timeout*/5 * 1000); + /* + * Make sure that periph_priv pointers are clean. + */ + bzero(&ccb.ccb_h.periph_priv, sizeof ccb.ccb_h.periph_priv); if (ioctl(targfd, TARGIOCCOMMAND, &ccb) == -1) { perror("TARGIOCCOMMAND"); |
