diff options
| author | Tom Caputi <[email protected]> | 2018-01-19 04:19:47 -0500 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2018-02-02 11:43:11 -0800 |
| commit | 047116ac76526d869e3f347afb5d81cc2b156fdf (patch) | |
| tree | 8307d677ee02803b9341d3a7536e27cc71910194 /module/zfs/dmu_object.c | |
| parent | d53bd7f5244a1cd0009d2f90d3ec9df22352fbb3 (diff) | |
Raw sends must be able to decrease nlevels
Currently, when a raw zfs send file includes a DRR_OBJECT record
that would decrease the number of levels of an existing object,
the object is reallocated with dmu_object_reclaim() which
creates the new dnode using the old object's nlevels. For non-raw
sends this doesn't really matter, but raw sends require that
nlevels on the receive side match that of the send side so that
the checksum-of-MAC tree can be properly maintained. This patch
corrects the issue by freeing the object completely before
allocating it again in this case.
This patch also corrects several issues with dnode_hold_impl()
and related functions that prevented dnodes (particularly
multi-slot dnodes) from being reallocated properly due to
the fact that existing dnodes were not being fully cleaned up
when they were freed.
This patch adds a test to make sure that zfs recv functions
properly with incremental streams containing dnodes of different
sizes.
Reviewed by: Matthew Ahrens <[email protected]>
Reviewed-by: Jorgen Lundman <[email protected]>
Signed-off-by: Tom Caputi <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #6821
Closes #6864
Diffstat (limited to 'module/zfs/dmu_object.c')
| -rw-r--r-- | module/zfs/dmu_object.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/module/zfs/dmu_object.c b/module/zfs/dmu_object.c index e7412b750..f53da407f 100644 --- a/module/zfs/dmu_object.c +++ b/module/zfs/dmu_object.c @@ -275,7 +275,6 @@ dmu_object_reclaim_dnsize(objset_t *os, uint64_t object, dmu_object_type_t ot, return (err); } - int dmu_object_free(objset_t *os, uint64_t object, dmu_tx_t *tx) { |