xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UPSTREAM: erofs: remove the occupied parameter from z_erofs_pagevec_enqueue()

Browse Source 
No any behavior to variable occupied in z_erofs_attach_page() which
is only caller to z_erofs_pagevec_enqueue().

Link: https://lore.kernel.org/r/20210419102623.2015-1-zbestahu@gmail.com
Signed-off-by: Yue Hu <huyue2@yulong.com>
Reviewed-by: Gao Xiang <xiang@kernel.org>
Signed-off-by: Gao Xiang <xiang@kernel.org>

Bug: 206904737
Change-Id: I37f5496d89befe7550b63024b1ead4ce531a22a8
(cherry picked from commit 7dea3de7d384f4c8156e8bd93112ba6db1eb276c)
Signed-off-by: Huang Jianan <huangjianan@oppo.com>
This commit is contained in:
Yue Hu
2021-04-19 18:26:23 +08:00
committed by David Anderson
parent 504b13fb83
commit 028f7128c4
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fs/erofs/zdata.c
View File

@@ -380,7 +380,6 @@ static int z_erofs_attach_page(struct z_erofs_collector *clt,
enum z_erofs_page_type type) enum z_erofs_page_type type)
{ {
int ret; int ret;
bool occupied;
/* give priority for inplaceio */ /* give priority for inplaceio */
if (clt->mode >= COLLECT_PRIMARY && if (clt->mode >= COLLECT_PRIMARY &&
@@ -388,8 +387,7 @@ static int z_erofs_attach_page(struct z_erofs_collector *clt,
z_erofs_try_inplace_io(clt, page)) z_erofs_try_inplace_io(clt, page))
return 0; return 0;
ret = z_erofs_pagevec_enqueue(&clt->vector, ret = z_erofs_pagevec_enqueue(&clt->vector, page, type);
page, type, &occupied);
clt->cl->vcnt += (unsigned int)ret; clt->cl->vcnt += (unsigned int)ret;
return ret ? 0 : -EAGAIN; return ret ? 0 : -EAGAIN;

5
fs/erofs/zpvec.h
View File

@@ -107,10 +107,8 @@ static inline void z_erofs_pagevec_ctor_init(struct z_erofs_pagevec_ctor *ctor,
static inline bool z_erofs_pagevec_enqueue(struct z_erofs_pagevec_ctor *ctor, static inline bool z_erofs_pagevec_enqueue(struct z_erofs_pagevec_ctor *ctor,
struct page *page, struct page *page,
enum z_erofs_page_type type, enum z_erofs_page_type type)
bool *occupied)
{ {
*occupied = false;
if (!ctor->next && type) if (!ctor->next && type)
if (ctor->index + 1 == ctor->nr) if (ctor->index + 1 == ctor->nr)
return false; return false;
@@ -125,7 +123,6 @@ static inline bool z_erofs_pagevec_enqueue(struct z_erofs_pagevec_ctor *ctor,
/* should remind that collector->next never equal to 1, 2 */ /* should remind that collector->next never equal to 1, 2 */
if (type == (uintptr_t)ctor->next) { if (type == (uintptr_t)ctor->next) {
ctor->next = page; ctor->next = page;
*occupied = true;
} }
ctor->pages[ctor->index++] = tagptr_fold(erofs_vtptr_t, page, type); ctor->pages[ctor->index++] = tagptr_fold(erofs_vtptr_t, page, type);
return true; return true;