Fix send/recv lost spill block

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

diff --git a/include/sys/dmu_impl.h b/include/sys/dmu_impl.h
index f13a2a37ce844e4b328dcfc5c52044f27c426587..5e1901da4ac2f53302ec5b86d965813a735b710f 100644 (file)
--- a/include/sys/dmu_impl.h
+++ b/include/sys/dmu_impl.h
@@ -21,7 +21,10 @@
 /*
  * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
+ */
+/*
  * Copyright (c) 2012, Joyent, Inc. All rights reserved.
+ * Copyright (c) 2013, 2015 by Delphix. All rights reserved.
  */
 
 #ifndef _SYS_DMU_IMPL_H
@@ -83,7 +86,6 @@ extern "C" {
  *   held from:
  *     callers of dbuf_read_impl, dbuf_hold[_impl], dbuf_prefetch
  *     dmu_object_info_from_dnode: dn_dirty_mtx (dn_datablksz)
- *     dmu_tx_count_free:
  *     dbuf_read_impl: db_mtx, dmu_zfetch()
  *     dmu_zfetch: zf_rwlock/r, zst_lock, dbuf_prefetch()
  *     dbuf_new_size: db_mtx
@@ -159,6 +161,7 @@ extern "C" {
  *     dn_allocated_txg
  *     dn_free_txg
  *     dn_assigned_txg
+ *     dn_dirty_txg
  *     dd_assigned_tx
  *     dn_notxholds
  *     dn_dirtyctx
@@ -194,7 +197,6 @@ extern "C" {
  *     dsl_prop_changed_notify: none (dd_prop_cbs)
  *     dsl_prop_register: none (dd_prop_cbs)
  *     dsl_prop_unregister: none (dd_prop_cbs)
- *     dsl_dataset_block_freeable: none (dd_sync_*)
  *
  * os_lock (leaf)
  *   protects:
@@ -263,10 +265,23 @@ typedef struct dmu_sendarg {
        objset_t *dsa_os;
        zio_cksum_t dsa_zc;
        uint64_t dsa_toguid;
+       uint64_t dsa_fromtxg;
        int dsa_err;
        dmu_pendop_t dsa_pending_op;
+       uint64_t dsa_featureflags;
+       uint64_t dsa_last_data_object;
+       uint64_t dsa_last_data_offset;
+       uint64_t dsa_resume_object;
+       uint64_t dsa_resume_offset;
+       boolean_t dsa_sent_begin;
+       boolean_t dsa_sent_end;
 } dmu_sendarg_t;
 
+void dmu_object_zapify(objset_t *, uint64_t, dmu_object_type_t, dmu_tx_t *);
+void dmu_object_free_zapified(objset_t *, uint64_t, dmu_tx_t *);
+int dmu_buf_hold_noread(objset_t *, uint64_t, uint64_t,
+    void *, dmu_buf_t **);
+
 #ifdef __cplusplus
 }
 #endif