NEX-5553 ZFS auto-trim, manual-trim and scrub can race and deadlock
Reviewed by: Alek Pinchuk <alek.pinchuk@nexenta.com>
Reviewed by: Rob Gittins <rob.gittins@nexenta.com>
Reviewed by: Sanjay Nadkarni <sanjay.nadkarni@nexenta.com>
NEX-5064 On-demand trim should store operation start and stop time
Reviewed by: Roman Strashkin <roman.strashkin@nexenta.com>
Reviewed by: Alek Pinchuk <alek.pinchuk@nexenta.com>
NEX-3558 KRRP Integration

*** 19,39 ****
   * CDDL HEADER END
   */
  /*
   * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
   * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
   */
  
  #include <sys/dmu.h>
  #include <sys/dmu_tx.h>
  #include <sys/dsl_pool.h>
  #include <sys/dsl_dir.h>
  #include <sys/dsl_synctask.h>
  #include <sys/metaslab.h>
  
- #define DST_AVG_BLKSHIFT 14
- 
  /* ARGSUSED */
  static int
  dsl_null_checkfunc(void *arg, dmu_tx_t *tx)
  {
          return (0);
--- 19,38 ----
   * CDDL HEADER END
   */
  /*
   * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
   * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
+  * Copyright 2015 Nexenta Systems, Inc. All rights reserved.
   */
  
  #include <sys/dmu.h>
  #include <sys/dmu_tx.h>
  #include <sys/dsl_pool.h>
  #include <sys/dsl_dir.h>
  #include <sys/dsl_synctask.h>
  #include <sys/metaslab.h>
  
  /* ARGSUSED */
  static int
  dsl_null_checkfunc(void *arg, dmu_tx_t *tx)
  {
          return (0);
*** 110,120 ****
  
          if (dst.dst_error == EAGAIN) {
                  txg_wait_synced(dp, dst.dst_txg + TXG_DEFER_SIZE);
                  goto top;
          }
- 
          spa_close(spa, FTAG);
          return (dst.dst_error);
  }
  
  void
--- 109,118 ----