diff options
author | njl <njl@FreeBSD.org> | 2003-01-16 00:24:29 +0000 |
---|---|---|
committer | njl <njl@FreeBSD.org> | 2003-01-16 00:24:29 +0000 |
commit | c944d878a4e54b31628e406331a60df8ef7f3baa (patch) | |
tree | 348332012790bc682f84344efc77eaef7fd9782d /share/examples/scsi_target | |
parent | 1c294df6bb046fbe0991e97931522fc60ae0a9c8 (diff) | |
download | FreeBSD-src-c944d878a4e54b31628e406331a60df8ef7f3baa.zip FreeBSD-src-c944d878a4e54b31628e406331a60df8ef7f3baa.tar.gz |
kernel:
* Fix a bug where devices weren't cleaned up on close(): CAM_REQ_CMP != 0
user:
* Increase timeout in usermode to CAM_TIME_INFINITY. The initiator is in
charge of timeouts and the value was in ms, not seconds.
* Bring two debugging printfs under the debug flag
* Clean up man page to show increased testing on isp(4)
Submitted by: gibbs (bugfixes)
Diffstat (limited to 'share/examples/scsi_target')
-rw-r--r-- | share/examples/scsi_target/scsi_cmds.c | 6 | ||||
-rw-r--r-- | share/examples/scsi_target/scsi_target.c | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/share/examples/scsi_target/scsi_cmds.c b/share/examples/scsi_target/scsi_cmds.c index d624cfb..1cbe6d8 100644 --- a/share/examples/scsi_target/scsi_cmds.c +++ b/share/examples/scsi_target/scsi_cmds.c @@ -125,8 +125,10 @@ tcmd_handle(struct ccb_accept_tio *atio, struct ccb_scsiio *ctio, io_ops event) struct atio_descr *a_descr; int ret; - warnx("tcmd_handle atio %p ctio %p atioflags %#x", atio, ctio, - atio->ccb_h.flags); + if (debug) { + warnx("tcmd_handle atio %p ctio %p atioflags %#x", atio, ctio, + atio->ccb_h.flags); + } ret = 0; a_descr = (struct atio_descr *)atio->ccb_h.targ_descr; diff --git a/share/examples/scsi_target/scsi_target.c b/share/examples/scsi_target/scsi_target.c index 0f0d6b8..09f6610 100644 --- a/share/examples/scsi_target/scsi_target.c +++ b/share/examples/scsi_target/scsi_target.c @@ -453,7 +453,10 @@ request_loop() /* Assume work function handled the exception */ if ((ccb_h->status & CAM_DEV_QFRZN) != 0) { - warnx("Queue frozen receiving CCB, releasing"); + if (debug) { + warnx("Queue frozen receiving CCB, " + "releasing"); + } rel_simq(); } @@ -819,7 +822,7 @@ get_ctio() /* Initialize CTIO, CTIO descr, and AIO */ ctio->ccb_h.func_code = XPT_CONT_TARGET_IO; ctio->ccb_h.retry_count = 2; - ctio->ccb_h.timeout = 5; + ctio->ccb_h.timeout = CAM_TIME_INFINITY; ctio->data_ptr = c_descr->buf; ctio->ccb_h.targ_descr = c_descr; c_descr->aiocb.aio_buf = c_descr->buf; |