mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

zram: drop gfp_t from zcomp_strm_alloc() 

We now allocate streams from CPU_UP hot-plug path, there are no
context-dependent stream allocations anymore and we can schedule from
zcomp_strm_alloc().  Use GFP_KERNEL directly and drop a gfp_t parameter.

Link: http://lkml.kernel.org/r/20160531122017.2878-9-sergey.senozhatsky@gmail.com
Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Acked-by: Minchan Kim <minchan@kernel.org>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Sergey Senozhatsky 2016-07-26 15:22:59 -07:00 committed by Linus Torvalds
parent eb9f56d825
commit 16d37725a0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/block/zram/zcomp.c
View File

@ -47,9 +47,9 @@ static void zcomp_strm_free(struct zcomp_strm *zstrm)
* allocate new zcomp_strm structure with ->tfm initialized by * allocate new zcomp_strm structure with ->tfm initialized by
* backend, return NULL on error * backend, return NULL on error
*/ */
static struct zcomp_strm *zcomp_strm_alloc(struct zcomp *comp, gfp_t flags) static struct zcomp_strm *zcomp_strm_alloc(struct zcomp *comp)
{ {
struct zcomp_strm *zstrm = kmalloc(sizeof(*zstrm), flags); struct zcomp_strm *zstrm = kmalloc(sizeof(*zstrm), GFP_KERNEL);
if (!zstrm) if (!zstrm)
return NULL; return NULL;
@ -58,7 +58,7 @@ static struct zcomp_strm *zcomp_strm_alloc(struct zcomp *comp, gfp_t flags)
* allocate 2 pages. 1 for compressed data, plus 1 extra for the * allocate 2 pages. 1 for compressed data, plus 1 extra for the
* case when compressed size is larger than the original one * case when compressed size is larger than the original one
*/ */
zstrm->buffer = (void *)__get_free_pages(flags | __GFP_ZERO, 1); zstrm->buffer = (void *)__get_free_pages(GFP_KERNEL | __GFP_ZERO, 1);
if (IS_ERR_OR_NULL(zstrm->tfm) || !zstrm->buffer) { if (IS_ERR_OR_NULL(zstrm->tfm) || !zstrm->buffer) {
zcomp_strm_free(zstrm); zcomp_strm_free(zstrm);
zstrm = NULL; zstrm = NULL;
@ -169,7 +169,7 @@ static int __zcomp_cpu_notifier(struct zcomp *comp,
case CPU_UP_PREPARE: case CPU_UP_PREPARE:
if (WARN_ON(*per_cpu_ptr(comp->stream, cpu))) if (WARN_ON(*per_cpu_ptr(comp->stream, cpu)))
break; break;
zstrm = zcomp_strm_alloc(comp, GFP_KERNEL); zstrm = zcomp_strm_alloc(comp);
if (IS_ERR_OR_NULL(zstrm)) { if (IS_ERR_OR_NULL(zstrm)) {
pr_err("Can't allocate a compression stream\n"); pr_err("Can't allocate a compression stream\n");
return NOTIFY_BAD; return NOTIFY_BAD;