svn commit: r355918 - stable/12/sys/kern

[Alexander Motin]

Author: mav
Date: Fri Dec 20 00:25:56 2019
New Revision: 355918
URL: https://svnweb.freebsd.org/changeset/base/355918

Log:
  MFC r355457: Make devstat_end_transaction_bio() count BIO_ORDERED.

Modified:
  stable/12/sys/kern/subr_devstat.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/kern/subr_devstat.c
==============================================================================
--- stable/12/sys/kern/subr_devstat.c	Thu Dec 19 22:35:16 2019	(r355917)
+++ stable/12/sys/kern/subr_devstat.c	Fri Dec 20 00:25:56 2019	(r355918)
@@ -349,11 +349,16 @@ devstat_end_transaction_bio_bt(struct devstat *ds, con
     const struct bintime *now)
 {
 	devstat_trans_flags flg;
+	devstat_tag_type tag;
 
 	/* sanity check */
 	if (ds == NULL)
 		return;
 
+	if (bp->bio_flags & BIO_ORDERED)
+		tag = DEVSTAT_TAG_ORDERED;
+	else
+		tag = DEVSTAT_TAG_SIMPLE;
 	if (bp->bio_cmd == BIO_DELETE)
 		flg = DEVSTAT_FREE;
 	else if ((bp->bio_cmd == BIO_READ)
@@ -366,7 +371,7 @@ devstat_end_transaction_bio_bt(struct devstat *ds, con
 		flg = DEVSTAT_NO_DATA;
 
 	devstat_end_transaction(ds, bp->bio_bcount - bp->bio_resid,
-				DEVSTAT_TAG_SIMPLE, flg, now, &bp->bio_t0);
+				tag, flg, now, &bp->bio_t0);
 	DTRACE_DEVSTAT_BIO_DONE();
 }