Illumos 5056 - ZFS deadlock on db_mtx and dn_holds

[mirror_zfs.git] / include / sys / dbuf.h

diff --git a/include/sys/dbuf.h b/include/sys/dbuf.h
index d4e39b73f7965df8e0655805df5206847a3b4f19..c2f4f8bd0efc5ff6f2eb715dde6ce4228a9b85f1 100644 (file)
--- a/include/sys/dbuf.h
+++ b/include/sys/dbuf.h
@@ -22,6 +22,7 @@
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
  * Copyright (c) 2013 by Saso Kiselkov. All rights reserved.
+ * Copyright (c) 2014 Spectra Logic Corporation, All rights reserved.
  */
 
 #ifndef        _SYS_DBUF_H
@@ -226,9 +227,8 @@ typedef struct dmu_buf_impl {
 
        /* Data which is unique to data (leaf) blocks: */
 
-       /* stuff we store for the user (see dmu_buf_set_user) */
-       void *db_user_ptr;
-       dmu_buf_evict_func_t *db_evict_func;
+       /* User callback information. */
+       dmu_buf_user_t *db_user;
 
        uint8_t db_immediate_evict;
        uint8_t db_freed_in_flight;