erofs: drop z_erofs_page_mark_eio()

commit 9a05c6a8bc26138d34e87b39e6a815603bc2a66c upstream.

It can be folded into z_erofs_onlinepage_endio() to simplify the code.

Reviewed-by: Yue Hu <huyue2@coolpad.com>
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
Link: https://lore.kernel.org/r/20230817082813.81180-5-hsiangkao@linux.alibaba.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/erofs/zdata.c b/fs/erofs/zdata.c
index 5c0f855ab18dd6b04baf2d1b76281d2a4e174569..b05ca443cfdf44ea58ef96c559de475a5e583f52 100644 (file)
--- a/fs/erofs/zdata.c
+++ b/fs/erofs/zdata.c
@@ -144,22 +144,17 @@ static inline void z_erofs_onlinepage_split(struct page *page)
        atomic_inc((atomic_t *)&page->private);
 }
 
-static inline void z_erofs_page_mark_eio(struct page *page)
+static void z_erofs_onlinepage_endio(struct page *page, int err)
 {
-       int orig;
+       int orig, v;
+
+       DBG_BUGON(!PagePrivate(page));
 
        do {
                orig = atomic_read((atomic_t *)&page->private);
-       } while (atomic_cmpxchg((atomic_t *)&page->private, orig,
-                               orig | Z_EROFS_PAGE_EIO) != orig);
-}
-
-static inline void z_erofs_onlinepage_endio(struct page *page)
-{
-       unsigned int v;
+               v = (orig - 1) | (err ? Z_EROFS_PAGE_EIO : 0);
+       } while (atomic_cmpxchg((atomic_t *)&page->private, orig, v) != orig);
 
-       DBG_BUGON(!PagePrivate(page));
-       v = atomic_dec_return((atomic_t *)&page->private);
        if (!(v & ~Z_EROFS_PAGE_EIO)) {
                set_page_private(page, 0);
                ClearPagePrivate(page);
@@ -930,9 +925,7 @@ next_part:
                goto repeat;
 
 out:
-       if (err)
-               z_erofs_page_mark_eio(page);
-       z_erofs_onlinepage_endio(page);
+       z_erofs_onlinepage_endio(page, err);
        return err;
 }
 
@@ -1035,9 +1028,7 @@ static void z_erofs_fill_other_copies(struct z_erofs_decompress_backend *be,
                        cur += len;
                }
                kunmap_local(dst);
-               if (err)
-                       z_erofs_page_mark_eio(bvi->bvec.page);
-               z_erofs_onlinepage_endio(bvi->bvec.page);
+               z_erofs_onlinepage_endio(bvi->bvec.page, err);
                list_del(p);
                kfree(bvi);
        }
@@ -1205,9 +1196,7 @@ out:
                /* recycle all individual short-lived pages */
                if (z_erofs_put_shortlivedpage(be->pagepool, page))
                        continue;
-               if (err)
-                       z_erofs_page_mark_eio(page);
-               z_erofs_onlinepage_endio(page);
+               z_erofs_onlinepage_endio(page, err);
        }
 
        if (be->decompressed_pages != be->onstack_pages)