diff options
| author | Tom Caputi <[email protected]> | 2018-02-21 15:28:52 -0500 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2018-02-21 12:28:52 -0800 |
| commit | b1d217338a51b025b802ebf6a759f45dcd8e3b4c (patch) | |
| tree | d9b8be3fa8ee4123d343a97286834fcb15433d4f /module/zfs/arc.c | |
| parent | 5121c4fb0c25a369d2e6f61e5b0a79969f0b75b5 (diff) | |
Raw receives must compress metadnode blocks
Currently, the DMU relies on ZIO layer compression to free LO
dnode blocks that no longer have objects in them. However,
raw receives disable all compression, meaning that these blocks
can never be freed. In addition to the obvious space concerns,
this could also cause incremental raw receives to fail to mount
since the MAC of a hole is different from that of a completely
zeroed block.
This patch corrects this issue by adding a special case in
zio_write_compress() which will attempt to compress these blocks
to a hole even if ZIO_FLAG_RAW_ENCRYPT is set. This patch also
removes the zfs_mdcomp_disable tunable, since tuning it could
cause these same issues.
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Tom Caputi <[email protected]>
Closes #7198
Diffstat (limited to 'module/zfs/arc.c')
| -rw-r--r-- | module/zfs/arc.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/module/zfs/arc.c b/module/zfs/arc.c index 7aa221b00..a78a029c2 100644 --- a/module/zfs/arc.c +++ b/module/zfs/arc.c @@ -6776,6 +6776,9 @@ arc_write_ready(zio_t *zio) buf->b_flags &= ~ARC_BUF_FLAG_ENCRYPTED; if (BP_GET_COMPRESS(bp) == ZIO_COMPRESS_OFF) buf->b_flags &= ~ARC_BUF_FLAG_COMPRESSED; + } else if (BP_IS_HOLE(bp) && ARC_BUF_ENCRYPTED(buf)) { + buf->b_flags &= ~ARC_BUF_FLAG_ENCRYPTED; + buf->b_flags &= ~ARC_BUF_FLAG_COMPRESSED; } /* this must be done after the buffer flags are adjusted */ |