Alexander Motin 8ce70dfcfa Fix mismerge in r337196. ... ZoL did the same mistake, and fixed it with separate commit 863522b1f9: dsl_scan_scrub_cb: don't double-account non-embedded blocks We were doing count_block() twice inside this function, once unconditionally at the beginning (intended to catch the embedded block case) and once near the end after processing the block. The double-accounting caused the "zpool scrub" progress statistics in "zpool status" to climb from 0% to 200% instead of 0% to 100%, and showed double the I/O rate it was actually seeing. This was apparently a regression introduced in commit 00c405b4b5, which was an incorrect port of this OpenZFS commit: https://github.com/openzfs/openzfs/commit/d8a447a7 Reviewed by: Thomas Caputi <tcaputi@datto.com> Reviewed by: Matt Ahrens <matt@delphix.com> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed-by: George Melikov <mail@gmelikov.ru> Signed-off-by: Steven Noonan <steven@uplinklabs.net> Closes #7720 Closes #7738 Reported by: sef		2018-08-15 21:01:57 +00:00
..
boot/zfs	Mark two things as unused (since they are only sometimes used) and	2017-12-03 04:55:33 +00:00
compat/opensolaris	MFV/ZoL: add dbuf stats	2018-08-12 01:10:18 +00:00
contrib/opensolaris	Fix mismerge in r337196.	2018-08-15 21:01:57 +00:00
dev	dtrace/powerpc: Correct register indices for non-indexed registers in the trapframe	2018-07-16 19:47:29 +00:00