svn commit: r266608 - stable/10/sys/geom

[Alexander Motin]

Author: mav
Date: Sat May 24 10:20:56 2014
New Revision: 266608
URL: http://svnweb.freebsd.org/changeset/base/266608

Log:
  MFC r266319:
  Make GEOM DISK to account also BIO_FLUSH operations.

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

Modified: stable/10/sys/geom/geom_disk.c
==============================================================================
--- stable/10/sys/geom/geom_disk.c	Sat May 24 09:50:10 2014	(r266607)
+++ stable/10/sys/geom/geom_disk.c	Sat May 24 10:20:56 2014	(r266608)
@@ -243,7 +243,7 @@ g_disk_done(struct bio *bp)
 	if (bp2->bio_error == 0)
 		bp2->bio_error = bp->bio_error;
 	bp2->bio_completed += bp->bio_completed;
-	if ((bp->bio_cmd & (BIO_READ|BIO_WRITE|BIO_DELETE)) != 0)
+	if ((bp->bio_cmd & (BIO_READ|BIO_WRITE|BIO_DELETE|BIO_FLUSH)) != 0)
 		devstat_end_transaction_bio_bt(sc->dp->d_devstat, bp, &now);
 	bp2->bio_inbed++;
 	if (bp2->bio_children == bp2->bio_inbed) {
@@ -264,7 +264,7 @@ g_disk_done_single(struct bio *bp)
 	bp->bio_completed = bp->bio_length - bp->bio_resid;
 	bp->bio_done = (void *)bp->bio_to;
 	bp->bio_to = LIST_FIRST(&bp->bio_disk->d_geom->provider);
-	if ((bp->bio_cmd & (BIO_READ|BIO_WRITE|BIO_DELETE)) != 0) {
+	if ((bp->bio_cmd & (BIO_READ|BIO_WRITE|BIO_DELETE|BIO_FLUSH)) != 0) {
 		binuptime(&now);
 		sc = bp->bio_to->private;
 		mtx_lock(&sc->done_mtx);
@@ -441,6 +441,9 @@ g_disk_start(struct bio *bp)
 		bp->bio_disk = dp;
 		bp->bio_to = (void *)bp->bio_done;
 		bp->bio_done = g_disk_done_single;
+		mtx_lock(&sc->start_mtx); 
+		devstat_start_transaction_bio(dp->d_devstat, bp);
+		mtx_unlock(&sc->start_mtx); 
 		g_disk_lock_giant(dp);
 		dp->d_strategy(bp);
 		g_disk_unlock_giant(dp);