LU-17081 build: Prefer folio_batch to pagevec

[fs/lustre-release.git] / lustre / osd-ldiskfs / osd_io.c

diff --git a/lustre/osd-ldiskfs/osd_io.c b/lustre/osd-ldiskfs/osd_io.c
index 7b253bd..c093c40 100644 (file)
--- a/lustre/osd-ldiskfs/osd_io.c
+++ b/lustre/osd-ldiskfs/osd_io.c
@@ -663,11 +663,11 @@ static int osd_bufs_put(const struct lu_env *env, struct dt_object *dt,
        struct osd_device *osd = osd_obj2dev(osd_dt_obj(dt));
        struct osd_thread_info *oti = osd_oti_get(env);
        struct osd_iobuf *iobuf = &oti->oti_iobuf;
-       struct pagevec pvec;
+       struct folio_batch fbatch;
        int i;
 
        osd_brw_stats_update(osd, iobuf);
-       ll_pagevec_init(&pvec, 0);
+       ll_folio_batch_init(&fbatch, 0);
 
        for (i = 0; i < npages; i++) {
                struct page *page = lnb[i].lnb_page;
@@ -683,8 +683,8 @@ static int osd_bufs_put(const struct lu_env *env, struct dt_object *dt,
                } else {
                        if (lnb[i].lnb_locked)
                                unlock_page(page);
-                       if (pagevec_add(&pvec, page) == 0)
-                               pagevec_release(&pvec);
+                       if (folio_batch_add_page(&fbatch, page) == 0)
+                               folio_batch_release(&fbatch);
                }
 
                lnb[i].lnb_page = NULL;
@@ -692,8 +692,8 @@ static int osd_bufs_put(const struct lu_env *env, struct dt_object *dt,
 
        LASSERTF(oti->oti_dio_pages_used == 0, "%d\n", oti->oti_dio_pages_used);
 
-       /* Release any partial pagevec */
-       pagevec_release(&pvec);
+       /* Release any partial folio_batch */
+       folio_batch_release(&fbatch);
 
        RETURN(0);
 }