diff options
| author | Tom Caputi <[email protected]> | 2017-11-30 12:40:13 -0500 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2017-11-30 09:40:13 -0800 |
| commit | d4677269f286005768ae1a0fcd3389aa6015c4c7 (patch) | |
| tree | da3859982e48be50d983c8510220c6ae1487ef02 /module | |
| parent | ed15d544812eb720d2fbec55d27e749d7a805bf6 (diff) | |
Unbreak the scan status ABI
When d4a72f23 was merged, pss_pass_issued was incorrectly
added to the middle of the pool_scan_stat_t structure
instead of the end. This patch simply corrects this issue.
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: George Melikov <[email protected]>
Signed-off-by: Tom Caputi <[email protected]>
Closes #6909
Diffstat (limited to 'module')
| -rw-r--r-- | module/zfs/spa_misc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/module/zfs/spa_misc.c b/module/zfs/spa_misc.c index 116b0ebd9..dc0f8d5fe 100644 --- a/module/zfs/spa_misc.c +++ b/module/zfs/spa_misc.c @@ -2040,19 +2040,19 @@ spa_scan_get_stats(spa_t *spa, pool_scan_stat_t *ps) ps->pss_start_time = scn->scn_phys.scn_start_time; ps->pss_end_time = scn->scn_phys.scn_end_time; ps->pss_to_examine = scn->scn_phys.scn_to_examine; + ps->pss_examined = scn->scn_phys.scn_examined; ps->pss_to_process = scn->scn_phys.scn_to_process; ps->pss_processed = scn->scn_phys.scn_processed; ps->pss_errors = scn->scn_phys.scn_errors; - ps->pss_examined = scn->scn_phys.scn_examined; - ps->pss_issued = - scn->scn_issued_before_pass + spa->spa_scan_pass_issued; /* data not stored on disk */ - ps->pss_pass_start = spa->spa_scan_pass_start; ps->pss_pass_exam = spa->spa_scan_pass_exam; - ps->pss_pass_issued = spa->spa_scan_pass_issued; + ps->pss_pass_start = spa->spa_scan_pass_start; ps->pss_pass_scrub_pause = spa->spa_scan_pass_scrub_pause; ps->pss_pass_scrub_spent_paused = spa->spa_scan_pass_scrub_spent_paused; + ps->pss_pass_issued = spa->spa_scan_pass_issued; + ps->pss_issued = + scn->scn_issued_before_pass + spa->spa_scan_pass_issued; return (0); } |