mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-25 03:37:45 +03:00
abd: lift ABD zero scan from zio_compress_data() to abd_cmp_zero()
It's now the caller's responsibility do special handling for holes if that's something it wants. This also makes zio_compress_data() and zio_decompress_data() properly the inverse of each other. Sponsored-by: Klara, Inc. Sponsored-by: Wasabi Technology, Inc. Reviewed-by: Alexander Motin <mav@FreeBSD.org> Reviewed-by: Tino Reichardt <milky-zfs@mcmilk.de> Reviewed-by: Jason Lee <jasonlee@lanl.gov> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Rob Norris <rob.norris@klarasystems.com> Closes #16326
This commit is contained in:
+12
-5
@@ -1859,8 +1859,13 @@ zio_write_compress(zio_t *zio)
|
||||
if (compress != ZIO_COMPRESS_OFF &&
|
||||
!(zio->io_flags & ZIO_FLAG_RAW_COMPRESS)) {
|
||||
void *cbuf = NULL;
|
||||
psize = zio_compress_data(compress, zio->io_abd, &cbuf, lsize,
|
||||
zp->zp_complevel);
|
||||
if (abd_cmp_zero(zio->io_abd, lsize) == 0)
|
||||
psize = 0;
|
||||
else if (compress == ZIO_COMPRESS_EMPTY)
|
||||
psize = lsize;
|
||||
else
|
||||
psize = zio_compress_data(compress, zio->io_abd, &cbuf,
|
||||
lsize, zp->zp_complevel);
|
||||
if (psize == 0) {
|
||||
compress = ZIO_COMPRESS_OFF;
|
||||
} else if (psize >= lsize) {
|
||||
@@ -1924,10 +1929,12 @@ zio_write_compress(zio_t *zio)
|
||||
* receive, we must check whether the block can be compressed
|
||||
* to a hole.
|
||||
*/
|
||||
psize = zio_compress_data(ZIO_COMPRESS_EMPTY,
|
||||
zio->io_abd, NULL, lsize, zp->zp_complevel);
|
||||
if (psize == 0 || psize >= lsize)
|
||||
if (abd_cmp_zero(zio->io_abd, lsize) == 0) {
|
||||
psize = 0;
|
||||
compress = ZIO_COMPRESS_OFF;
|
||||
} else {
|
||||
psize = lsize;
|
||||
}
|
||||
} else if (zio->io_flags & ZIO_FLAG_RAW_COMPRESS &&
|
||||
!(zio->io_flags & ZIO_FLAG_RAW_ENCRYPT)) {
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user