提交 7dea3de7 编写于 作者: Y Yue Hu 提交者: Gao Xiang

erofs: remove the occupied parameter from z_erofs_pagevec_enqueue()

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.comSigned-off-by: NYue Hu <huyue2@yulong.com>
Reviewed-by: NGao Xiang <xiang@kernel.org>
Signed-off-by: NGao Xiang <xiang@kernel.org>
上级 0508c1ad
...@@ -380,7 +380,6 @@ static int z_erofs_attach_page(struct z_erofs_collector *clt, ...@@ -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, ...@@ -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;
......
...@@ -107,10 +107,8 @@ static inline void z_erofs_pagevec_ctor_init(struct z_erofs_pagevec_ctor *ctor, ...@@ -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, ...@@ -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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册