Linux 3.11 compat: Rename LZ4 symbols

Linus Torvalds merged LZ4 into Linux 3.11. This causes a conflict
whenever CONFIG_LZ4_DECOMPRESS=y or CONFIG_LZ4_COMPRESS=y are set in the
kernel's .config. We rename the symbols to avoid the conflict.

Signed-off-by: Richard Yao <ryao@gentoo.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #1789

diff --git a/include/sys/zio_compress.h b/include/sys/zio_compress.h
index bd051f185b4150141afe20b2a63401c7df40347f..e4b565d5e25c551c5157b0c790ee3e023c20fe10 100644 (file)
--- a/include/sys/zio_compress.h
+++ b/include/sys/zio_compress.h
@@ -74,9 +74,9 @@ extern size_t zle_compress(void *src, void *dst, size_t s_len, size_t d_len,
     int level);
 extern int zle_decompress(void *src, void *dst, size_t s_len, size_t d_len,
     int level);
-extern size_t lz4_compress(void *src, void *dst, size_t s_len, size_t d_len,
+extern size_t lz4_compress_zfs(void *src, void *dst, size_t s_len, size_t d_len,
     int level);
-extern int lz4_decompress(void *src, void *dst, size_t s_len, size_t d_len,
+extern int lz4_decompress_zfs(void *src, void *dst, size_t s_len, size_t d_len,
     int level);
 
 /*

diff --git a/module/zfs/lz4.c b/module/zfs/lz4.c
index 8afaad1304555580114b0c72471e3121adbf1567..ae5d5a23a6e8a759e35dffac87c4b8dd7df1e386 100644 (file)
--- a/module/zfs/lz4.c
+++ b/module/zfs/lz4.c
@@ -47,7 +47,7 @@ static kmem_cache_t *lz4_cache;
 
 /*ARGSUSED*/
 size_t
-lz4_compress(void *s_start, void *d_start, size_t s_len, size_t d_len, int n)
+lz4_compress_zfs(void *s_start, void *d_start, size_t s_len, size_t d_len, int n)
 {
        uint32_t bufsiz;
        char *dest = d_start;
@@ -74,7 +74,7 @@ lz4_compress(void *s_start, void *d_start, size_t s_len, size_t d_len, int n)
 
 /*ARGSUSED*/
 int
-lz4_decompress(void *s_start, void *d_start, size_t s_len, size_t d_len, int n)
+lz4_decompress_zfs(void *s_start, void *d_start, size_t s_len, size_t d_len, int n)
 {
        const char *src = s_start;
        uint32_t bufsiz = BE_IN32(src);

diff --git a/module/zfs/zio_compress.c b/module/zfs/zio_compress.c
index 1dc780d4bf66d9cc310b2203f97f9af85acb3720..5864d5c8a1a99df57908c42c18ddfa28add3c470 100644 (file)
--- a/module/zfs/zio_compress.c
+++ b/module/zfs/zio_compress.c
@@ -53,7 +53,7 @@ zio_compress_info_t zio_compress_table[ZIO_COMPRESS_FUNCTIONS] = {
        {gzip_compress,         gzip_decompress,        8,      "gzip-8"},
        {gzip_compress,         gzip_decompress,        9,      "gzip-9"},
        {zle_compress,          zle_decompress,         64,     "zle"},
-       {lz4_compress,          lz4_decompress,         0,      "lz4"},
+       {lz4_compress_zfs,      lz4_decompress_zfs,     0,      "lz4"},
 };
 
 enum zio_compress