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

Linux 3.11 compat: Rename LZ4 symbols

Browse Source 
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
This commit is contained in:
Richard Yao
2013-10-05 17:55:24 -04:00
committed by Brian Behlendorf
parent 2e2ddc30b4
commit b3c49d3df8
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/zfs/lz4.c
+2 -2
View File
@@ -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);