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>

@@ -19,10 +19,11 @@
  * CDDL HEADER END
  */
 /*
  * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2014 Spectra Logic Corporation, All rights reserved.
  */
 
 #ifndef _SYS_SA_IMPL_H
 #define _SYS_SA_IMPL_H
 

@@ -208,10 +209,11 @@
  *
  * This needs to be kept as small as possible.
  */
 
 struct sa_handle {
+        dmu_buf_user_t  sa_dbu;
         kmutex_t        sa_lock;
         dmu_buf_t       *sa_bonus;
         dmu_buf_t       *sa_spill;
         objset_t        *sa_os;
         void            *sa_userp;