svn commit: r281012 - stable/10/sys/geom/mirror

[Alexander Motin]

Author: mav
Date: Fri Apr  3 06:16:20 2015
New Revision: 281012
URL: https://svnweb.freebsd.org/changeset/base/281012

Log:
  MFC r280756, r280758: Fix bug on memory allocation error in split method.
  
  While there, use bioq_takefirst() in place where it is convenient.

Modified:
  stable/10/sys/geom/mirror/g_mirror.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/geom/mirror/g_mirror.c
==============================================================================
--- stable/10/sys/geom/mirror/g_mirror.c	Fri Apr  3 02:37:43 2015	(r281011)
+++ stable/10/sys/geom/mirror/g_mirror.c	Fri Apr  3 06:16:20 2015	(r281012)
@@ -1588,7 +1588,7 @@ g_mirror_request_split(struct g_mirror_s
 		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);
@@ -1871,7 +1871,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) {
@@ -1899,7 +1899,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 &&