c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-26 12:12:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

compress: standardise names of compression functions

Browse Source 
This is mostly to make searching easier.

Sponsored-by: Klara, Inc.
Sponsored-by: Wasabi Technology, Inc.
Signed-off-by: Rob Norris <rob.norris@klarasystems.com>
This commit is contained in:
Rob Norris
2024-06-29 11:16:50 +10:00
committed by Tony Hutter
parent dd0c08f9c6
commit 522816498c
9 changed files with 122 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/zfs/dsl_dataset.c
+1 -1
View File
@@ -2426,7 +2426,7 @@ get_receive_resume_token_impl(dsl_dataset_t *ds)
compressed = kmem_alloc(packed_size, KM_SLEEP);
/* Call compress function directly to avoid hole detection. */
compressed_size = gzip_compress(packed, compressed,
compressed_size = zfs_gzip_compress(packed, compressed,
packed_size, packed_size, 6);
zio_cksum_t cksum;
module/zfs/gzip.c
+4 -2
View File
@@ -48,7 +48,8 @@ typedef uLongf zlen_t;
#endif
size_t
gzip_compress(void *s_start, void *d_start, size_t s_len, size_t d_len, int n)
zfs_gzip_compress(void *s_start, void *d_start, size_t s_len,
size_t d_len, int n)
{
int ret;
zlen_t dstlen = d_len;
@@ -83,7 +84,8 @@ gzip_compress(void *s_start, void *d_start, size_t s_len, size_t d_len, int n)
}
int
gzip_decompress(void *s_start, void *d_start, size_t s_len, size_t d_len, int n)
zfs_gzip_decompress(void *s_start, void *d_start, size_t s_len,
size_t d_len, int n)
{
(void) n;
zlen_t dstlen = d_len;
module/zfs/lz4_zfs.c
+2 -2
View File
@@ -53,7 +53,7 @@ int LZ4_uncompress_unknownOutputSize(const char *source, char *dest,
static kmem_cache_t *lz4_cache;
size_t
lz4_compress_zfs(void *s_start, void *d_start, size_t s_len,
zfs_lz4_compress(void *s_start, void *d_start, size_t s_len,
size_t d_len, int n)
{
(void) n;
@@ -81,7 +81,7 @@ lz4_compress_zfs(void *s_start, void *d_start, size_t s_len,
}
int
lz4_decompress_zfs(void *s_start, void *d_start, size_t s_len,
zfs_lz4_decompress(void *s_start, void *d_start, size_t s_len,
size_t d_len, int n)
{
(void) n;
module/zfs/lzjb.c
+4 -2
View File
@@ -46,7 +46,8 @@
#define LEMPEL_SIZE 1024
size_t
lzjb_compress(void *s_start, void *d_start, size_t s_len, size_t d_len, int n)
zfs_lzjb_compress(void *s_start, void *d_start, size_t s_len,
size_t d_len, int n)
{
(void) n;
uchar_t *src = s_start;
@@ -101,7 +102,8 @@ lzjb_compress(void *s_start, void *d_start, size_t s_len, size_t d_len, int n)
}
int
lzjb_decompress(void *s_start, void *d_start, size_t s_len, size_t d_len, int n)
zfs_lzjb_decompress(void *s_start, void *d_start,
size_t s_len, size_t d_len, int n)
{
(void) s_len, (void) n;
uchar_t *src = s_start;
module/zfs/zio_compress.c
+30 -18
View File
@@ -54,24 +54,36 @@ static unsigned long zio_decompress_fail_fraction = 0;
* PART OF THE ON-DISK FORMAT.
*/
zio_compress_info_t zio_compress_table[ZIO_COMPRESS_FUNCTIONS] = {
{"inherit", 0, NULL, NULL, NULL},
{"on", 0, NULL, NULL, NULL},
{"uncompressed", 0, NULL, NULL, NULL},
{"lzjb", 0, lzjb_compress, lzjb_decompress, NULL},
{"empty", 0, NULL, NULL, NULL},
{"gzip-1", 1, gzip_compress, gzip_decompress, NULL},
{"gzip-2", 2, gzip_compress, gzip_decompress, NULL},
{"gzip-3", 3, gzip_compress, gzip_decompress, NULL},
{"gzip-4", 4, gzip_compress, gzip_decompress, NULL},
{"gzip-5", 5, gzip_compress, gzip_decompress, NULL},
{"gzip-6", 6, gzip_compress, gzip_decompress, NULL},
{"gzip-7", 7, gzip_compress, gzip_decompress, NULL},
{"gzip-8", 8, gzip_compress, gzip_decompress, NULL},
{"gzip-9", 9, gzip_compress, gzip_decompress, NULL},
{"zle", 64, zle_compress, zle_decompress, NULL},
{"lz4", 0, lz4_compress_zfs, lz4_decompress_zfs, NULL},
{"zstd", ZIO_ZSTD_LEVEL_DEFAULT, zfs_zstd_compress_wrap,
zfs_zstd_decompress, zfs_zstd_decompress_level},
{"inherit", 0, NULL, NULL, NULL},
{"on", 0, NULL, NULL, NULL},
{"uncompressed", 0, NULL, NULL, NULL},
{"lzjb", 0,
zfs_lzjb_compress, zfs_lzjb_decompress, NULL},
{"empty", 0, NULL, NULL, NULL},
{"gzip-1", 1,
zfs_gzip_compress, zfs_gzip_decompress, NULL},
{"gzip-2", 2,
zfs_gzip_compress, zfs_gzip_decompress, NULL},
{"gzip-3", 3,
zfs_gzip_compress, zfs_gzip_decompress, NULL},
{"gzip-4", 4,
zfs_gzip_compress, zfs_gzip_decompress, NULL},
{"gzip-5", 5,
zfs_gzip_compress, zfs_gzip_decompress, NULL},
{"gzip-6", 6,
zfs_gzip_compress, zfs_gzip_decompress, NULL},
{"gzip-7", 7,
zfs_gzip_compress, zfs_gzip_decompress, NULL},
{"gzip-8", 8,
zfs_gzip_compress, zfs_gzip_decompress, NULL},
{"gzip-9", 9,
zfs_gzip_compress, zfs_gzip_decompress, NULL},
{"zle", 64,
zfs_zle_compress, zfs_zle_decompress, NULL},
{"lz4", 0,
zfs_lz4_compress, zfs_lz4_decompress, NULL},
{"zstd", ZIO_ZSTD_LEVEL_DEFAULT,
zfs_zstd_compress, zfs_zstd_decompress, zfs_zstd_decompress_level},
};
uint8_t
module/zfs/zle.c
+4 -2
View File
@@ -35,7 +35,8 @@
#include <sys/zio_compress.h>
size_t
zle_compress(void *s_start, void *d_start, size_t s_len, size_t d_len, int n)
zfs_zle_compress(void *s_start, void *d_start, size_t s_len,
size_t d_len, int n)
{
uchar_t *src = s_start;
uchar_t *dst = d_start;
@@ -65,7 +66,8 @@ zle_compress(void *s_start, void *d_start, size_t s_len, size_t d_len, int n)
}
int
zle_decompress(void *s_start, void *d_start, size_t s_len, size_t d_len, int n)
zfs_zle_decompress(void *s_start, void *d_start, size_t s_len,
size_t d_len, int n)
{
uchar_t *src = s_start;
uchar_t *dst = d_start;