evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mm: zcache: disallow sleep in zcache store

Browse source 
zcache store ops cannot sleep since it is called from
an atomic context. Pass the right flags to alloc functions.

Change-Id: I9c7956e895fb7909932315aa3d85845127aa02e1
Signed-off-by: Vinayak Menon <vinmenon@codeaurora.org>
This commit is contained in:
Vinayak Menon 2015-06-25 14:02:07 +05:30 • committed by David Keitel
parent 37b371fd53
commit 42bfd5ca64
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
mm/zcache.c
View file

@ -70,6 +70,8 @@ static u64 zcache_evict_filepages;
static u64 zcache_reclaim_fail;
static atomic_t zcache_stored_pages = ATOMIC_INIT(0);
#define GFP_ZCACHE \
(__GFP_FS | __GFP_NORETRY | __GFP_NOWARN | __GFP_NOMEMALLOC)
/*
* Zcache receives pages for compression through the Cleancache API and is able
* to evict pages from its own compressed pool on an LRU basis in the case that
@ -405,7 +407,8 @@ static int zcache_store_zaddr(struct zcache_pool *zpool,
rbnode = zcache_find_get_rbnode(zpool, zhandle->rb_index);
if (!rbnode) {
/* alloc and init a new rbnode */
rbnode = kmem_cache_alloc(zcache_rbnode_cache, GFP_KERNEL);
rbnode = kmem_cache_alloc(zcache_rbnode_cache,
GFP_ZCACHE);
if (!rbnode)
return -ENOMEM;
@ -523,7 +526,7 @@ static void zcache_store_page(int pool_id, struct cleancache_filekey key,
/* store zcache handle together with compressed page data */
ret = zbud_alloc(zpool->pool, zlen + sizeof(struct zcache_ra_handle),
__GFP_NORETRY | __GFP_NOWARN, &zaddr);
GFP_ZCACHE, &zaddr);
if (ret) {
zcache_zbud_alloc_fail++;
put_cpu_var(zcache_dstmem);