diff options
| author | sos <sos@FreeBSD.org> | 2002-03-07 19:20:23 +0000 |
|---|---|---|
| committer | sos <sos@FreeBSD.org> | 2002-03-07 19:20:23 +0000 |
| commit | 15f98e2cbc3e5d0983831f82986ab1aa88cbc5c2 (patch) | |
| tree | ecfb819b4f6aaf2e54caccce908792ade1f73dbf /sys/dev | |
| parent | cd2f87a7653ab734ad9ce5b2aca1cd64e76fb547 (diff) | |
| download | FreeBSD-src-15f98e2cbc3e5d0983831f82986ab1aa88cbc5c2.zip FreeBSD-src-15f98e2cbc3e5d0983831f82986ab1aa88cbc5c2.tar.gz | |
Oops I mixed up the patch for -current & -stable, sorry ....
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ata/ata-raid.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/ata/ata-raid.c b/sys/dev/ata/ata-raid.c index 51f2657..5724fab 100644 --- a/sys/dev/ata/ata-raid.c +++ b/sys/dev/ata/ata-raid.c @@ -583,7 +583,7 @@ ar_rebuild(struct ar_softc *rdp) buffer = malloc(256 * DEV_BSIZE, M_AR, M_NOWAIT | M_ZERO); /* now go copy entire disk(s) */ - while (rdp->lock_start < (rdp->total_sectors / rdp->width)) { + while (rdp->lock_end < (rdp->total_sectors / rdp->width)) { int size = min(256, (rdp->total_sectors / rdp->width) - rdp->lock_end); for (disk = 0; disk < rdp->width; disk++) { @@ -1177,9 +1177,9 @@ ar_rw(struct ad_softc *adp, u_int32_t lba, int count, caddr_t data, int flags) bp->bio_done = ar_rw_done; AR_STRATEGY(bp); if (flags & AR_WAIT) { - error = tsleep(bp, PRIBIO, "arrw", 10 * hz); - if (!error && bp->b_flags & B_ERROR) - error = bp->b_error; + error = tsleep(bp, PRIBIO, "arrw", 0); + if (!error && bp->bio_flags & BIO_ERROR) + error = bp->bio_error; free(bp, M_AR); } return error; |
