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>

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

@@ -150,10 +151,11 @@
                 uint16_t lf_next;       /* next in free list, or CHAIN_END */
         } l_free;
 } zap_leaf_chunk_t;
 
 typedef struct zap_leaf {
+        dmu_buf_user_t l_dbu;
         krwlock_t l_rwlock;
         uint64_t l_blkid;               /* 1<<ZAP_BLOCK_SHIFT byte block off */
         int l_bs;                       /* block size shift */
         dmu_buf_t *l_dbuf;
 } zap_leaf_t;