d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix couple BIO_DELETE bugs in geom_mirror.

Browse Source 
Do not report GEOM::candelete if none of providers support BIO_DELETE.
If consumer still requests BIO_DELETE, report error instead of hanging.

MFC after:	2 weeks
This commit is contained in:
mav 2015-03-12 10:20:53 +00:00
parent cc29b99b5c
commit 19bf0d882b
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sys/geom/mirror/g_mirror.c
View File

@ -1020,6 +1020,23 @@ g_mirror_sync_done(struct bio *bp)
wakeup(sc);
}
static void
g_mirror_candelete(struct bio *bp)
{
struct g_mirror_softc *sc;
struct g_mirror_disk *disk;
int *val;
sc = bp->bio_to->geom->softc;
LIST_FOREACH(disk, &sc->sc_disks, d_next) {
if (disk->d_flags & G_MIRROR_DISK_FLAG_CANDELETE)
break;
}
val = (int *)bp->bio_data;
*val = (disk != NULL);
g_io_deliver(bp, 0);
}
static void
g_mirror_kernel_dump(struct bio *bp)
{
@ -1114,9 +1131,10 @@ g_mirror_start(struct bio *bp)
g_mirror_flush(sc, bp);
return;
case BIO_GETATTR:
if (g_handleattr_int(bp, "GEOM::candelete", 1))
if (!strcmp(bp->bio_attribute, "GEOM::candelete")) {
g_mirror_candelete(bp);
return;
else if (strcmp("GEOM::kerneldump", bp->bio_attribute) == 0) {
} else if (strcmp("GEOM::kerneldump", bp->bio_attribute) == 0) {
g_mirror_kernel_dump(bp);
return;
}
@ -1680,6 +1698,10 @@ g_mirror_register_request(struct bio *bp)
("Consumer %s not opened (r%dw%de%d).",
cp->provider->name, cp->acr, cp->acw, cp->ace));
}
if (bioq_first(&queue) == NULL) {
g_io_deliver(bp, EOPNOTSUPP);
return;
}
while ((cbp = bioq_takefirst(&queue)) != NULL) {
G_MIRROR_LOGREQ(3, cbp, "Sending request.");
cp = cbp->bio_caller1;