summaryrefslogtreecommitdiff
path: root/sys/dev/ata/ata-raid.c
diff options
context:
space:
mode:
authorSøren Schmidt <sos@FreeBSD.org>2003-05-04 16:17:54 +0000
committerSøren Schmidt <sos@FreeBSD.org>2003-05-04 16:17:54 +0000
commit64ff745cf5be9d4374c4f81fec5794419b88672c (patch)
tree8c355f43a726cfd9d4b679cbee628e6d1f9829e0 /sys/dev/ata/ata-raid.c
parent40791d9d15e29400c0df0702333382bfcbe48866 (diff)
Notes
Diffstat (limited to 'sys/dev/ata/ata-raid.c')
-rw-r--r--sys/dev/ata/ata-raid.c33
1 files changed, 27 insertions, 6 deletions
diff --git a/sys/dev/ata/ata-raid.c b/sys/dev/ata/ata-raid.c
index 72699393788a..403db8871e46 100644
--- a/sys/dev/ata/ata-raid.c
+++ b/sys/dev/ata/ata-raid.c
@@ -764,13 +764,34 @@ arstrategy(struct bio *bp)
return;
}
if (bp->bio_cmd == BIO_READ) {
- if ((buf1->bp.bio_pblkno <
- (rdp->disks[buf1->drive].last_lba - AR_PROXIMITY) ||
- buf1->bp.bio_pblkno >
- (rdp->disks[buf1->drive].last_lba + AR_PROXIMITY) ||
- !(rdp->disks[buf1->drive].flags & AR_DF_ONLINE)) &&
- (rdp->disks[buf1->drive+rdp->width].flags & AR_DF_ONLINE))
+ /* if mirror gone or close to last access on source */
+ if (!(rdp->disks[buf1->drive+rdp->width].flags & AR_DF_ONLINE)||
+ (buf1->bp.bio_pblkno >=
+ (rdp->disks[buf1->drive].last_lba - AR_PROXIMITY) &&
+ buf1->bp.bio_pblkno <=
+ (rdp->disks[buf1->drive].last_lba + AR_PROXIMITY))) {
+ rdp->flags &= ~AR_F_TOGGLE;
+ }
+ /* if source gone or close to last access on mirror */
+ else if (!(rdp->disks[buf1->drive].flags & AR_DF_ONLINE) ||
+ (buf1->bp.bio_pblkno >=
+ (rdp->disks[buf1->drive + rdp->width].last_lba -
+ AR_PROXIMITY) &&
+ buf1->bp.bio_pblkno <=
+ (rdp->disks[buf1->drive + rdp->width].last_lba +
+ AR_PROXIMITY))) {
+ buf1->drive = buf1->drive + rdp->width;
+ rdp->flags |= AR_F_TOGGLE;
+ }
+ /* not close to any previous access, toggle */
+ else {
+ if (rdp->flags & AR_F_TOGGLE)
+ rdp->flags &= ~AR_F_TOGGLE;
+ else {
buf1->drive = buf1->drive + rdp->width;
+ rdp->flags |= AR_F_TOGGLE;
+ }
+ }
}
if (bp->bio_cmd == BIO_WRITE) {
if ((rdp->disks[buf1->drive+rdp->width].flags & AR_DF_ONLINE) ||