diff options
| author | Tom Caputi <[email protected]> | 2017-08-23 19:54:24 -0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2017-08-23 16:54:24 -0700 |
| commit | 9b8407638da71ea9f4afb21375f991869f19811f (patch) | |
| tree | 864fd6f860707bbf979aa2f648ec6d7e24434670 /include/sys/dmu.h | |
| parent | db4c1adaf82db7815baa675d7df3952f46b07ae9 (diff) | |
Send / Recv Fixes following b52563
This patch fixes several issues discovered after
the encryption patch was merged:
* Fixed a bug where encrypted datasets could attempt
to receive embedded data records.
* Fixed a bug where dirty records created by the recv
code wasn't properly setting the dr_raw flag.
* Fixed a typo where a dmu_tx_commit() was changed to
dmu_tx_abort()
* Fixed a few error handling bugs unrelated to the
encryption patch in dmu_recv_stream()
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Tom Caputi <[email protected]>
Closes #6512
Closes #6524
Closes #6545
Diffstat (limited to 'include/sys/dmu.h')
| -rw-r--r-- | include/sys/dmu.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/sys/dmu.h b/include/sys/dmu.h index 7c7e6dcbf..60778289e 100644 --- a/include/sys/dmu.h +++ b/include/sys/dmu.h @@ -448,8 +448,9 @@ void dmu_object_set_checksum(objset_t *os, uint64_t object, uint8_t checksum, void dmu_object_set_compress(objset_t *os, uint64_t object, uint8_t compress, dmu_tx_t *tx); -void -dmu_write_embedded(objset_t *os, uint64_t object, uint64_t offset, +int dmu_object_dirty_raw(objset_t *os, uint64_t object, dmu_tx_t *tx); + +void dmu_write_embedded(objset_t *os, uint64_t object, uint64_t offset, void *data, uint8_t etype, uint8_t comp, int uncompressed_size, int compressed_size, int byteorder, dmu_tx_t *tx); |