summaryrefslogtreecommitdiffstats
path: root/sys/scsi/scsi_ioctl.c
diff options
context:
space:
mode:
authordufault <dufault@FreeBSD.org>1995-04-14 15:10:44 +0000
committerdufault <dufault@FreeBSD.org>1995-04-14 15:10:44 +0000
commita644aba5017dfc9956e335d54cbdc4f68b763576 (patch)
tree3a69b37cbf049735d0cbf7b77ca3da8ae11c9866 /sys/scsi/scsi_ioctl.c
parent3ce68508565a04b191a7642e35ddbfeaef1c0c67 (diff)
downloadFreeBSD-src-a644aba5017dfc9956e335d54cbdc4f68b763576.zip
FreeBSD-src-a644aba5017dfc9956e335d54cbdc4f68b763576.tar.gz
Added "scsi target" device that can act as a target for scsi transfers
from an initiator Added Julian's support for residuals. Added Julian's fixes to the tape driver Made compile cleanly with -Wall Reduce boot up output
Diffstat (limited to 'sys/scsi/scsi_ioctl.c')
-rw-r--r--sys/scsi/scsi_ioctl.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/sys/scsi/scsi_ioctl.c b/sys/scsi/scsi_ioctl.c
index 90dc134..c34fe59 100644
--- a/sys/scsi/scsi_ioctl.c
+++ b/sys/scsi/scsi_ioctl.c
@@ -38,7 +38,7 @@
* SUCH DAMAGE.
*End copyright
*
- * $Id: scsi_ioctl.c,v 1.11 1995/03/01 22:24:42 dufault Exp $
+ * $Id: scsi_ioctl.c,v 1.12 1995/03/04 20:50:55 dufault Exp $
*
*
*/
@@ -97,7 +97,10 @@ struct scsi_xfer *xs;
switch((int)xs->error) {
case XS_NOERROR:
SC_DEBUG(xs->sc_link,SDEV_DB3,("no error\n"));
- screq->datalen_used = xs->datalen - xs->resid; /* probably rubbish */
+ if (xs->flags & SCSI_RESID_VALID)
+ screq->datalen_used = xs->datalen - xs->resid;
+ else
+ screq->datalen_used = xs->datalen;
screq->retsts = SCCMD_OK;
break;
@@ -283,7 +286,7 @@ struct proc *p, struct scsi_link *sc_link)
if (len) {
struct uio auio;
struct iovec aiov;
- long cnt, error = 0;
+ long cnt;
aiov.iov_base = d_addr;
aiov.iov_len = len;
OpenPOWER on IntegriCloud