git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix 'zpool events' formatting for awk
[zfs.git]
/
module
/
zfs
/
dsl_scan.c
diff --git
a/module/zfs/dsl_scan.c
b/module/zfs/dsl_scan.c
index
525832b
..
107c81b
100644
(file)
--- a/
module/zfs/dsl_scan.c
+++ b/
module/zfs/dsl_scan.c
@@
-50,9
+50,7
@@
typedef int (scan_cb_t)(dsl_pool_t *, const blkptr_t *, const zbookmark_t *);
typedef int (scan_cb_t)(dsl_pool_t *, const blkptr_t *, const zbookmark_t *);
-static scan_cb_t dsl_scan_defrag_cb;
static scan_cb_t dsl_scan_scrub_cb;
static scan_cb_t dsl_scan_scrub_cb;
-static scan_cb_t dsl_scan_remove_cb;
static dsl_syncfunc_t dsl_scan_cancel_sync;
static void dsl_scan_sync_state(dsl_scan_t *, dmu_tx_t *tx);
static dsl_syncfunc_t dsl_scan_cancel_sync;
static void dsl_scan_sync_state(dsl_scan_t *, dmu_tx_t *tx);
@@
-194,9
+192,9
@@
dsl_scan_setup_sync(void *arg1, void *arg2, dmu_tx_t *tx)
if (vdev_resilver_needed(spa->spa_root_vdev,
&scn->scn_phys.scn_min_txg, &scn->scn_phys.scn_max_txg)) {
if (vdev_resilver_needed(spa->spa_root_vdev,
&scn->scn_phys.scn_min_txg, &scn->scn_phys.scn_max_txg)) {
- spa_event_notify(spa, NULL,
ESC
_ZFS_RESILVER_START);
+ spa_event_notify(spa, NULL,
FM_EREPORT
_ZFS_RESILVER_START);
} else {
} else {
- spa_event_notify(spa, NULL,
ESC
_ZFS_SCRUB_START);
+ spa_event_notify(spa, NULL,
FM_EREPORT
_ZFS_SCRUB_START);
}
spa->spa_scrub_started = B_TRUE;
}
spa->spa_scrub_started = B_TRUE;
@@
-213,8
+211,8
@@
dsl_scan_setup_sync(void *arg1, void *arg2, dmu_tx_t *tx)
/* back to the generic stuff */
if (dp->dp_blkstats == NULL) {
/* back to the generic stuff */
if (dp->dp_blkstats == NULL) {
- dp->dp_blkstats =
-
kmem_alloc(sizeof (zfs_all_blkstats_t), KM_SLEEP
);
+ dp->dp_blkstats =
kmem_alloc(sizeof (zfs_all_blkstats_t),
+
KM_SLEEP | KM_NODEBUG
);
}
bzero(dp->dp_blkstats, sizeof (zfs_all_blkstats_t));
}
bzero(dp->dp_blkstats, sizeof (zfs_all_blkstats_t));
@@
-297,7
+295,8
@@
dsl_scan_done(dsl_scan_t *scn, boolean_t complete, dmu_tx_t *tx)
complete ? scn->scn_phys.scn_max_txg : 0, B_TRUE);
if (complete) {
spa_event_notify(spa, NULL, scn->scn_phys.scn_min_txg ?
complete ? scn->scn_phys.scn_max_txg : 0, B_TRUE);
if (complete) {
spa_event_notify(spa, NULL, scn->scn_phys.scn_min_txg ?
- ESC_ZFS_RESILVER_FINISH : ESC_ZFS_SCRUB_FINISH);
+ FM_EREPORT_ZFS_RESILVER_FINISH :
+ FM_EREPORT_ZFS_SCRUB_FINISH);
}
spa_errlog_rotate(spa);
}
spa_errlog_rotate(spa);