From cbbdd2831800b21813f0f0decb27269131367463 Mon Sep 17 00:00:00 2001
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Sun, 23 Dec 2018 19:14:31 +0000
Subject: [PATCH] nvdimm SPA geom: Update bio fields needed for
 devstat_end_transaction_bio().

Reported by:	bde
MFC after:	1 week
Sponsored by:	The FreeBSD Foundation
---
 sys/dev/nvdimm/nvdimm_spa.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sys/dev/nvdimm/nvdimm_spa.c b/sys/dev/nvdimm/nvdimm_spa.c
index 9737b5e0271..7784450bea2 100644
--- a/sys/dev/nvdimm/nvdimm_spa.c
+++ b/sys/dev/nvdimm/nvdimm_spa.c
@@ -337,8 +337,10 @@ nvdimm_spa_g_thread(void *arg)
 				auio.uio_td = curthread;
 				error = uiomove_fromphys(bp->bio_ma,
 				    bp->bio_ma_offset, bp->bio_length, &auio);
+				bp->bio_resid = auio.uio_resid;
 			} else {
 				nvdimm_spa_g_all_unmapped(spa, bp, bp->bio_cmd);
+				bp->bio_resid = bp->bio_length;
 				error = 0;
 			}
 		} else {
@@ -353,7 +355,9 @@ nvdimm_spa_g_thread(void *arg)
 			    UIO_WRITE;
 			auio.uio_td = curthread;
 			error = nvdimm_spa_uio(spa, &auio);
+			bp->bio_resid = auio.uio_resid;
 		}
+		bp->bio_bcount = bp->bio_length;
 		devstat_end_transaction_bio(spa->spa_g_devstat, bp);
 completed:
 		bp->bio_completed = bp->bio_length;