Print this page
2882 implement libzfs_core
2883 changing "canmount" property to "on" should not always remount dataset
2900 "zfs snapshot" should be able to create multiple, arbitrary snapshots at once
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Chris Siden <christopher.siden@delphix.com>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Reviewed by: Bill Pijewski <wdp@joyent.com>
Reviewed by: Dan Kruchinin <dan.kruchinin@gmail.com>

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/fs/zfs/dsl_scan.c
          +++ new/usr/src/uts/common/fs/zfs/dsl_scan.c
↓ open down ↓ 220 lines elided ↑ open up ↑
 221  221          bzero(dp->dp_blkstats, sizeof (zfs_all_blkstats_t));
 222  222  
 223  223          if (spa_version(spa) < SPA_VERSION_DSL_SCRUB)
 224  224                  ot = DMU_OT_ZAP_OTHER;
 225  225  
 226  226          scn->scn_phys.scn_queue_obj = zap_create(dp->dp_meta_objset,
 227  227              ot ? ot : DMU_OT_SCAN_QUEUE, DMU_OT_NONE, 0, tx);
 228  228  
 229  229          dsl_scan_sync_state(scn, tx);
 230  230  
 231      -        spa_history_log_internal(LOG_POOL_SCAN, spa, tx,
      231 +        spa_history_log_internal(spa, "scan setup", tx,
 232  232              "func=%u mintxg=%llu maxtxg=%llu",
 233  233              *funcp, scn->scn_phys.scn_min_txg, scn->scn_phys.scn_max_txg);
 234  234  }
 235  235  
 236  236  /* ARGSUSED */
 237  237  static void
 238  238  dsl_scan_done(dsl_scan_t *scn, boolean_t complete, dmu_tx_t *tx)
 239  239  {
 240  240          static const char *old_names[] = {
 241  241                  "scrub_bookmark",
↓ open down ↓ 28 lines elided ↑ open up ↑
 270  270           * with anything else.
 271  271           */
 272  272          if (scn->scn_phys.scn_state != DSS_SCANNING)
 273  273                  return;
 274  274  
 275  275          if (complete)
 276  276                  scn->scn_phys.scn_state = DSS_FINISHED;
 277  277          else
 278  278                  scn->scn_phys.scn_state = DSS_CANCELED;
 279  279  
 280      -        spa_history_log_internal(LOG_POOL_SCAN_DONE, spa, tx,
      280 +        spa_history_log_internal(spa, "scan done", tx,
 281  281              "complete=%u", complete);
 282  282  
 283  283          if (DSL_SCAN_IS_SCRUB_RESILVER(scn)) {
 284  284                  mutex_enter(&spa->spa_scrub_lock);
 285  285                  while (spa->spa_scrub_inflight > 0) {
 286  286                          cv_wait(&spa->spa_scrub_io_cv,
 287  287                              &spa->spa_scrub_lock);
 288  288                  }
 289  289                  mutex_exit(&spa->spa_scrub_lock);
 290  290                  spa->spa_scrub_started = B_FALSE;
↓ open down ↓ 1454 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX