summaryrefslogtreecommitdiff
path: root/drivers/block
diff options
context:
space:
mode:
authorSergey Senozhatsky <sergey.senozhatsky@gmail.com>2016-01-14 15:22:35 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-01-15 11:40:52 -0800
commite02d238c9852a91b30da9ea32ce36d1416cdc683 (patch)
tree71086a6b6dfef99f3d446d477fe0d1124e860916 /drivers/block
parent75d8947a36d0c9aedd69118d1f14bf424005c7c2 (diff)
zram/zcomp: do not zero out zcomp private pages
Do not __GFP_ZERO allocated zcomp ->private pages. We keep allocated streams around and use them for read/write requests, so we supply a zeroed out ->private to compression algorithm as a scratch buffer only once -- the first time we use that stream. For the rest of IO requests served by this stream ->private usually contains some temporarily data from the previous requests. Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> Acked-by: Minchan Kim <minchan@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/zram/zcomp_lz4.c4
-rw-r--r--drivers/block/zram/zcomp_lzo.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/block/zram/zcomp_lz4.c b/drivers/block/zram/zcomp_lz4.c
index dc2338d5258c..0110086accba 100644
--- a/drivers/block/zram/zcomp_lz4.c
+++ b/drivers/block/zram/zcomp_lz4.c
@@ -19,10 +19,10 @@ static void *zcomp_lz4_create(gfp_t flags)
{
void *ret;
- ret = kzalloc(LZ4_MEM_COMPRESS, flags);
+ ret = kmalloc(LZ4_MEM_COMPRESS, flags);
if (!ret)
ret = __vmalloc(LZ4_MEM_COMPRESS,
- flags | __GFP_ZERO | __GFP_HIGHMEM,
+ flags | __GFP_HIGHMEM,
PAGE_KERNEL);
return ret;
}
diff --git a/drivers/block/zram/zcomp_lzo.c b/drivers/block/zram/zcomp_lzo.c
index 0ab6fce8abe4..ed7a1f0549ec 100644
--- a/drivers/block/zram/zcomp_lzo.c
+++ b/drivers/block/zram/zcomp_lzo.c
@@ -19,10 +19,10 @@ static void *lzo_create(gfp_t flags)
{
void *ret;
- ret = kzalloc(LZO1X_MEM_COMPRESS, flags);
+ ret = kmalloc(LZO1X_MEM_COMPRESS, flags);
if (!ret)
ret = __vmalloc(LZO1X_MEM_COMPRESS,
- flags | __GFP_ZERO | __GFP_HIGHMEM,
+ flags | __GFP_HIGHMEM,
PAGE_KERNEL);
return ret;
}