diff options
| author | Yue Hu <huyue2@yulong.com> | 2021-11-06 09:23:15 +0100 |
|---|---|---|
| committer | Gao Xiang <xiang@kernel.org> | 2021-11-08 03:02:34 +0100 |
| commit | 4c7e42552b3a1536f3cdf534aba8c4262ee26716 (patch) | |
| tree | caf6de53051e589c0817e4312294de300f4a4d02 /fs/erofs | |
| parent | erofs: fix unsafe pagevec reuse of hooked pclusters (diff) | |
| download | linux-4c7e42552b3a1536f3cdf534aba8c4262ee26716.tar.xz linux-4c7e42552b3a1536f3cdf534aba8c4262ee26716.zip | |
erofs: remove useless cache strategy of DELAYEDALLOC
After commit 1825c8d7ce93 ("erofs: force inplace I/O under low
memory scenario") and TRYALLOC is widely used, DELAYEDALLOC won't
be used anymore. Remove related dead code. Also, remove the blank
line at the end of zdata.h.
Link: https://lore.kernel.org/r/20211106082315.25781-1-huyue2@yulong.com
Reviewed-by: Gao Xiang <hsiangkao@linux.alibaba.com>
Signed-off-by: Yue Hu <huyue2@yulong.com>
Signed-off-by: Gao Xiang <xiang@kernel.org>
Diffstat (limited to 'fs/erofs')
| -rw-r--r-- | fs/erofs/zdata.c | 20 | ||||
| -rw-r--r-- | fs/erofs/zdata.h | 1 |
2 files changed, 0 insertions, 21 deletions
diff --git a/fs/erofs/zdata.c b/fs/erofs/zdata.c index eb51df4a9f77..274119656857 100644 --- a/fs/erofs/zdata.c +++ b/fs/erofs/zdata.c @@ -96,16 +96,9 @@ static void z_erofs_free_pcluster(struct z_erofs_pcluster *pcl) DBG_BUGON(1); } -/* - * a compressed_pages[] placeholder in order to avoid - * being filled with file pages for in-place decompression. - */ -#define PAGE_UNALLOCATED ((void *)0x5F0E4B1D) - /* how to allocate cached pages for a pcluster */ enum z_erofs_cache_alloctype { DONTALLOC, /* don't allocate any cached pages */ - DELAYEDALLOC, /* delayed allocation (at the time of submitting io) */ /* * try to use cached I/O if page allocation succeeds or fallback * to in-place I/O instead to avoid any direct reclaim. @@ -267,10 +260,6 @@ static void preload_compressed_pages(struct z_erofs_collector *clt, /* I/O is needed, no possible to decompress directly */ standalone = false; switch (type) { - case DELAYEDALLOC: - t = tagptr_init(compressed_page_t, - PAGE_UNALLOCATED); - break; case TRYALLOC: newpage = erofs_allocpage(pagepool, gfp); if (!newpage) @@ -1092,15 +1081,6 @@ repeat: if (!page) goto out_allocpage; - /* - * the cached page has not been allocated and - * an placeholder is out there, prepare it now. - */ - if (page == PAGE_UNALLOCATED) { - tocache = true; - goto out_allocpage; - } - /* process the target tagged pointer */ t = tagptr_init(compressed_page_t, page); justfound = tagptr_unfold_tags(t); diff --git a/fs/erofs/zdata.h b/fs/erofs/zdata.h index 3a008f1b9f78..9321b35ee494 100644 --- a/fs/erofs/zdata.h +++ b/fs/erofs/zdata.h @@ -186,4 +186,3 @@ static inline void z_erofs_onlinepage_endio(struct page *page) #define Z_EROFS_VMAP_GLOBAL_PAGES 2048 #endif - |