Page MenuHomeFreeBSD
Files F109890337

D41222.diff
No OneTemporary
Actions

D41222.diff
View Options

diff --git a/sys/geom/raid/tr_concat.c b/sys/geom/raid/tr_concat.c
--- a/sys/geom/raid/tr_concat.c
+++ b/sys/geom/raid/tr_concat.c
@@ -240,8 +240,10 @@
offset -= vol->v_subdisks[no].sd_size;
no++;
}
- KASSERT(no < vol->v_disks_count,
- ("Request starts after volume end (%ju)", bp->bio_offset));
+ if (no >= vol->v_disks_count) {
+ g_raid_iodone(bp, EIO);
+ return;
+ }
bioq_init(&queue);
do {
sd = &vol->v_subdisks[no];
@@ -267,10 +269,8 @@
addr += length;
offset = 0;
no++;
- KASSERT(no < vol->v_disks_count || remain == 0,
- ("Request ends after volume end (%ju, %ju)",
- bp->bio_offset, bp->bio_length));
- } while (remain > 0);
+ } while (remain > 0 && no < vol->v_disks_count);
+ bp->bio_completed = bp->bio_length - remain;
while ((cbp = bioq_takefirst(&queue)) != NULL) {
sd = cbp->bio_caller1;
cbp->bio_caller1 = NULL;
@@ -308,8 +308,8 @@
offset -= vol->v_subdisks[no].sd_size;
no++;
}
- KASSERT(no < vol->v_disks_count,
- ("Request starts after volume end (%ju)", boffset));
+ if (no >= vol->v_disks_count)
+ return (EIO);
do {
sd = &vol->v_subdisks[no];
length = MIN(sd->sd_size - offset, remain);
@@ -321,10 +321,9 @@
addr += length;
offset = 0;
no++;
- KASSERT(no < vol->v_disks_count || remain == 0,
- ("Request ends after volume end (%ju, %zu)",
- boffset, blength));
- } while (remain > 0);
+ } while (remain > 0 && no < vol->v_disks_count);
+ if (remain > 0)
+ return (EIO);
return (0);
}
@@ -340,7 +339,6 @@
g_destroy_bio(bp);
pbp->bio_inbed++;
if (pbp->bio_children == pbp->bio_inbed) {
- pbp->bio_completed = pbp->bio_length;
g_raid_iodone(pbp, pbp->bio_error);
}
}

File Metadata

Mime Type
text/plain
Expires
Tue, Feb 11, 8:19 PM (15 h, 3 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16600581
Default Alt Text
D41222.diff (1 KB)

Event Timeline