shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 10:58:48 +09:00
Code Issues Packages Projects Releases Wiki Activity

UPSTREAM: erofs: refine managed inode stuffs

Browse Source 
Set up the correct gfp mask and use it instead of hard coding.
Also add comments about .invalidatepage() to show more details.

Link: https://lore.kernel.org/r/20220310182743.102365-2-hsiangkao@linux.alibaba.com
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>

Bug: 297961372
(cherry picked from commit 9f2731d633)
Change-Id: I9331cb53a7a8ff0ae7bc00c2ef09cc70715cf162
Signed-off-by: Edward Wu <edwardwu@realtek.com>
This commit is contained in:
Gao Xiang
2022-03-11 02:27:43 +08:00
committed by Sandeep Dhavale
parent b014a90325
commit 2296fa4c8f
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fs/erofs/super.c
View File

@@ -582,6 +582,11 @@ static int erofs_managed_cache_releasepage(struct page *page, gfp_t gfp_mask)
return ret; return ret;
} }
/*
* It will be called only on inode eviction. In case that there are still some
* decompression requests in progress, wait with rescheduling for a bit here.
* We could introduce an extra locking instead but it seems unnecessary.
*/
static void erofs_managed_cache_invalidatepage(struct page *page, static void erofs_managed_cache_invalidatepage(struct page *page,
unsigned int offset, unsigned int offset,
unsigned int length) unsigned int length)
@@ -615,8 +620,7 @@ static int erofs_init_managed_cache(struct super_block *sb)
inode->i_size = OFFSET_MAX; inode->i_size = OFFSET_MAX;
inode->i_mapping->a_ops = &managed_cache_aops; inode->i_mapping->a_ops = &managed_cache_aops;
mapping_set_gfp_mask(inode->i_mapping, mapping_set_gfp_mask(inode->i_mapping, GFP_NOFS);
GFP_NOFS | __GFP_HIGHMEM | __GFP_MOVABLE);
sbi->managed_cache = inode; sbi->managed_cache = inode;
return 0; return 0;
} }

7
fs/erofs/zdata.c
View File

@@ -1205,10 +1205,10 @@ static void z_erofs_decompressqueue_work(struct work_struct *work)
static struct page *pickup_page_for_submission(struct z_erofs_pcluster *pcl, static struct page *pickup_page_for_submission(struct z_erofs_pcluster *pcl,
unsigned int nr, unsigned int nr,
struct page **pagepool, struct page **pagepool,
struct address_space *mc, struct address_space *mc)
gfp_t gfp)
{ {
const pgoff_t index = pcl->obj.index; const pgoff_t index = pcl->obj.index;
gfp_t gfp = mapping_gfp_mask(mc);
bool tocache = false; bool tocache = false;
struct address_space *mapping; struct address_space *mapping;
@@ -1438,8 +1438,7 @@ static void z_erofs_submit_queue(struct super_block *sb,
struct page *page; struct page *page;
page = pickup_page_for_submission(pcl, i++, pagepool, page = pickup_page_for_submission(pcl, i++, pagepool,
MNGD_MAPPING(sbi), MNGD_MAPPING(sbi));
GFP_NOFS);
if (!page) if (!page)
continue; continue;