diff options
| author | Tom Caputi <[email protected]> | 2019-03-13 13:52:01 -0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2019-03-13 10:52:01 -0700 |
| commit | 369aa501d11f4d21d4732b58d749259ad811a10a (patch) | |
| tree | 747a00e61b8ae4348cccaa0cd234b39383898f57 /include/sys/dmu.h | |
| parent | 146bdc414c7ad5b93417569bff6737d57860ff14 (diff) | |
Fix handling of maxblkid for raw sends
Currently, the receive code can create an unreadable dataset from
a correct raw send stream. This is because it is currently
impossible to set maxblkid to a lower value without freeing the
associated object. This means truncating files on the send side
to a non-0 size could result in corruption. This patch solves this
issue by adding a new 'force' flag to dnode_new_blkid() which will
allow the raw receive code to force the DMU to accept the provided
maxblkid even if it is a lower value than the existing one.
For testing purposes the send_encrypted_files.ksh test has been
extended to include a variety of truncated files and multiple
snapshots. It also now leverages the xattrtest command to help
ensure raw receives correctly handle xattrs.
Reviewed-by: Paul Dagnelie <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Matt Ahrens <[email protected]>
Signed-off-by: Tom Caputi <[email protected]>
Closes #8168
Closes #8487
Diffstat (limited to 'include/sys/dmu.h')
| -rw-r--r-- | include/sys/dmu.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/sys/dmu.h b/include/sys/dmu.h index e4c2ebc2f..93d05aac4 100644 --- a/include/sys/dmu.h +++ b/include/sys/dmu.h @@ -477,7 +477,8 @@ int dmu_object_set_blocksize(objset_t *os, uint64_t object, uint64_t size, /* * Manually set the maxblkid on a dnode. This will adjust nlevels accordingly - * to accommodate the change. + * to accommodate the change. When calling this function, the caller must + * ensure that the object's nlevels can sufficiently support the new maxblkid. */ int dmu_object_set_maxblkid(objset_t *os, uint64_t object, uint64_t maxblkid, dmu_tx_t *tx); |