5056 ZFS deadlock on db_mtx and dn_holds
Reviewed by: Will Andrews <willa@spectralogic.com>
Reviewed by: Matt Ahrens <mahrens@delphix.com>
Reviewed by: George Wilson <george.wilson@delphix.com>
Approved by: Dan McDonald <danmcd@omniti.com>

*** 131,141 ****
  int sa_size(sa_handle_t *, sa_attr_type_t, int *);
  int sa_update_from_cb(sa_handle_t *, sa_attr_type_t,
      uint32_t buflen, sa_data_locator_t *, void *userdata, dmu_tx_t *);
  void sa_object_info(sa_handle_t *, dmu_object_info_t *);
  void sa_object_size(sa_handle_t *, uint32_t *, u_longlong_t *);
- void sa_update_user(sa_handle_t *, sa_handle_t *);
  void *sa_get_userdata(sa_handle_t *);
  void sa_set_userp(sa_handle_t *, void *);
  dmu_buf_t *sa_get_db(sa_handle_t *);
  uint64_t sa_handle_object(sa_handle_t *);
  boolean_t sa_attr_would_spill(sa_handle_t *, sa_attr_type_t, int size);
--- 131,140 ----