| From foo@baz Fri Nov 19 03:25:57 PM CET 2021 |
| From: Gao Xiang <hsiangkao@linux.alibaba.com> |
| Date: Tue, 16 Nov 2021 09:10:34 +0800 |
| Subject: erofs: remove the occupied parameter from z_erofs_pagevec_enqueue() |
| To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org |
| Cc: linux-erofs@lists.ozlabs.org, Yue Hu <huyue2@yulong.com>, Gao Xiang <xiang@kernel.org>, Gao Xiang <hsiangkao@linux.alibaba.com> |
| Message-ID: <20211116011035.124503-1-hsiangkao@linux.alibaba.com> |
| |
| From: Yue Hu <huyue2@yulong.com> |
| |
| commit 7dea3de7d384f4c8156e8bd93112ba6db1eb276c upstream. |
| |
| 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> |
| Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| fs/erofs/zdata.c | 4 +--- |
| fs/erofs/zpvec.h | 5 +---- |
| 2 files changed, 2 insertions(+), 7 deletions(-) |
| |
| --- a/fs/erofs/zdata.c |
| +++ b/fs/erofs/zdata.c |
| @@ -292,7 +292,6 @@ static int z_erofs_attach_page(struct z_ |
| enum z_erofs_page_type type) |
| { |
| int ret; |
| - bool occupied; |
| |
| /* give priority for inplaceio */ |
| if (clt->mode >= COLLECT_PRIMARY && |
| @@ -300,8 +299,7 @@ static int z_erofs_attach_page(struct z_ |
| z_erofs_try_inplace_io(clt, page)) |
| return 0; |
| |
| - ret = z_erofs_pagevec_enqueue(&clt->vector, |
| - page, type, &occupied); |
| + ret = z_erofs_pagevec_enqueue(&clt->vector, page, type); |
| clt->cl->vcnt += (unsigned int)ret; |
| |
| return ret ? 0 : -EAGAIN; |
| --- a/fs/erofs/zpvec.h |
| +++ b/fs/erofs/zpvec.h |
| @@ -107,10 +107,8 @@ static inline void z_erofs_pagevec_ctor_ |
| |
| static inline bool z_erofs_pagevec_enqueue(struct z_erofs_pagevec_ctor *ctor, |
| struct page *page, |
| - enum z_erofs_page_type type, |
| - bool *occupied) |
| + enum z_erofs_page_type type) |
| { |
| - *occupied = false; |
| if (!ctor->next && type) |
| if (ctor->index + 1 == ctor->nr) |
| return false; |
| @@ -125,7 +123,6 @@ static inline bool z_erofs_pagevec_enque |
| /* should remind that collector->next never equal to 1, 2 */ |
| if (type == (uintptr_t)ctor->next) { |
| ctor->next = page; |
| - *occupied = true; |
| } |
| ctor->pages[ctor->index++] = tagptr_fold(erofs_vtptr_t, page, type); |
| return true; |