diff options
| author | Tom Caputi <[email protected]> | 2018-06-06 13:16:41 -0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2018-06-06 10:16:41 -0700 |
| commit | e7504d7a188b666a61a8c2d8c1ffaa9713f6cdfa (patch) | |
| tree | ac99e6fad89bef6a6768a233c1fb99b827c01552 /module/zfs/sa.c | |
| parent | 6969afcefdfb49fb9c0fcf56240e6eb133a2c4a8 (diff) | |
Raw receive functions must not decrypt data
This patch fixes a small bug found where receive_spill() sometimes
attempted to decrypt spill blocks when doing a raw receive. In
addition, this patch fixes another small issue in arc_buf_fill()'s
error handling where a decryption failure (which could be caused by
the first bug) would attempt to set the arc header's IO_ERROR flag
without holding the header's lock.
Reviewed-by: Matthew Thode <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed by: Matthew Ahrens <[email protected]>
Signed-off-by: Tom Caputi <[email protected]>
Closes #7564
Closes #7584
Closes #7592
Diffstat (limited to 'module/zfs/sa.c')
| -rw-r--r-- | module/zfs/sa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/module/zfs/sa.c b/module/zfs/sa.c index 5b6b90642..75f7f8d96 100644 --- a/module/zfs/sa.c +++ b/module/zfs/sa.c @@ -698,7 +698,7 @@ sa_build_layouts(sa_handle_t *hdl, sa_bulk_attr_t *attr_desc, int attr_count, boolean_t dummy; if (hdl->sa_spill == NULL) { - VERIFY(dmu_spill_hold_by_bonus(hdl->sa_bonus, NULL, + VERIFY(dmu_spill_hold_by_bonus(hdl->sa_bonus, 0, NULL, &hdl->sa_spill) == 0); } dmu_buf_will_dirty(hdl->sa_spill, tx); |