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,28 ****
--- 19,29 ----
   * 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.
   */
  
  #ifndef _SYS_DSL_SYNCTASK_H
  #define _SYS_DSL_SYNCTASK_H
  
*** 83,92 ****
--- 84,94 ----
  void dsl_sync_task_sync(dsl_sync_task_t *, dmu_tx_t *);
  int dsl_sync_task(const char *, dsl_checkfunc_t *,
      dsl_syncfunc_t *, void *, int, zfs_space_check_t);
  void dsl_sync_task_nowait(struct dsl_pool *, dsl_syncfunc_t *,
      void *, int, zfs_space_check_t, dmu_tx_t *);
+ #define DST_AVG_BLKSHIFT 14
  
  #ifdef  __cplusplus
  }
  #endif