diff options
| author | Tom Caputi <[email protected]> | 2018-06-18 15:47:12 -0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2018-08-15 09:49:19 -0700 |
| commit | 1fff937a4c9d7b745540387d232c5ab2ba856fea (patch) | |
| tree | d5806c401cc4d014e9a853f81196ff5c5103a044 /module/zfs/dmu_objset.c | |
| parent | d9c460a0b659c044d4397b7405712f2c9450d3c4 (diff) | |
Check encrypted dataset + embedded recv earlier
This patch fixes a bug where attempting to receive a send stream
with embedded data into an encrypted dataset would not cleanup
that dataset when the error was reached. The check was moved into
dmu_recv_begin_check(), preventing this issue.
Reviewed-by: Jorgen Lundman <[email protected]>
Reviewed by: Matthew Ahrens <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Richard Elling <[email protected]>
Signed-off-by: Tom Caputi <[email protected]>
Closes #7650
Diffstat (limited to 'module/zfs/dmu_objset.c')
| -rw-r--r-- | module/zfs/dmu_objset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/module/zfs/dmu_objset.c b/module/zfs/dmu_objset.c index 5b18ed5cc..9adda320f 100644 --- a/module/zfs/dmu_objset.c +++ b/module/zfs/dmu_objset.c @@ -1118,7 +1118,7 @@ dmu_objset_create_check(void *arg, dmu_tx_t *tx) return (SET_ERROR(EEXIST)); } - error = dmu_objset_create_crypt_check(pdd, doca->doca_dcp); + error = dmu_objset_create_crypt_check(pdd, doca->doca_dcp, NULL); if (error != 0) { dsl_dir_rele(pdd, FTAG); return (error); |