diff options
Diffstat (limited to 'sys/scsi/sd.c')
| -rw-r--r-- | sys/scsi/sd.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c index 6dc072ef776..fe14b8ab623 100644 --- a/sys/scsi/sd.c +++ b/sys/scsi/sd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sd.c,v 1.148 2008/06/15 00:52:25 krw Exp $ */ +/* $OpenBSD: sd.c,v 1.149 2008/06/21 21:11:34 krw Exp $ */ /* $NetBSD: sd.c,v 1.111 1997/04/02 02:29:41 mycroft Exp $ */ /*- @@ -742,7 +742,7 @@ sdstart(void *v) */ error = scsi_scsi_cmd(sc_link, cmdp, cmdlen, (u_char *)bp->b_data, bp->b_bcount, - SDRETRIES, 60000, bp, SCSI_NOSLEEP | + SCSI_RETRIES, 60000, bp, SCSI_NOSLEEP | ((bp->b_flags & B_READ) ? SCSI_DATA_IN : SCSI_DATA_OUT)); switch (error) { case 0: @@ -1108,7 +1108,7 @@ sd_reassign_blocks(struct sd_softc *sd, u_long blkno) _lto4b(blkno, rbdata.defect_descriptor[0].dlbaddr); return scsi_scsi_cmd(sd->sc_link, (struct scsi_generic *)&scsi_cmd, - sizeof(scsi_cmd), (u_char *)&rbdata, sizeof(rbdata), SDRETRIES, + sizeof(scsi_cmd), (u_char *)&rbdata, sizeof(rbdata), SCSI_RETRIES, 5000, NULL, SCSI_DATA_OUT); } @@ -1283,7 +1283,7 @@ sddump(dev_t dev, daddr64_t blkno, caddr_t va, size_t size) bzero(xs, sizeof(sx)); xs->flags |= SCSI_AUTOCONF | SCSI_DATA_OUT; xs->sc_link = sd->sc_link; - xs->retries = SDRETRIES; + xs->retries = SCSI_RETRIES; xs->timeout = 10000; /* 10000 millisecs for a disk ! */ xs->cmd = (struct scsi_generic *)&cmd; xs->cmdlen = sizeof(cmd); @@ -1500,7 +1500,7 @@ sd_flush(struct sd_softc *sd, int flags) cmd.opcode = SYNCHRONIZE_CACHE; if (scsi_scsi_cmd(sc_link, (struct scsi_generic *)&cmd, sizeof(cmd), - NULL, 0, SDRETRIES, 100000, NULL, + NULL, 0, SCSI_RETRIES, 100000, NULL, flags | SCSI_IGNORE_ILLEGAL_REQUEST)) { SC_DEBUG(sc_link, SDEV_DB1, ("cache sync failed\n")); } else |