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

Fix bug on memory allocation error in split method.

Browse Source 
While there, use bioq_takefirst() in place where it is convenient.

MFC after:	1 week
This commit is contained in:
mav 2015-03-27 11:14:12 +00:00
parent 9632944658
commit 89133d309e
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1582,7 +1582,7 @@ g_mirror_request_split(struct g_mirror_softc *sc, struct bio *bp)
cbp = g_clone_bio(bp);
if (cbp == NULL) {
while ((cbp = bioq_takefirst(&queue)) != NULL)
bioq_remove(&queue, cbp);
g_destroy_bio(cbp);;
if (bp->bio_error == 0)
bp->bio_error = ENOMEM;
g_io_deliver(bp, bp->bio_error);
@ -1865,7 +1865,7 @@ g_mirror_worker(void *arg)
*/
/* Get first request from the queue. */
mtx_lock(&sc->sc_queue_mtx);
bp = bioq_first(&sc->sc_queue);
bp = bioq_takefirst(&sc->sc_queue);
if (bp == NULL) {
if ((sc->sc_flags &
G_MIRROR_DEVICE_FLAG_DESTROY) != 0) {
@ -1893,7 +1893,6 @@ g_mirror_worker(void *arg)
G_MIRROR_DEBUG(5, "%s: I'm here 4.", __func__);
continue;
}
bioq_remove(&sc->sc_queue, bp);
mtx_unlock(&sc->sc_queue_mtx);
if (bp->bio_from->geom == sc->sc_sync.ds_geom &&