1 files changed, 13 insertions, 11 deletions

diff --git a/drivers/lightnvm/pblk-cache.c b/drivers/lightnvm/pblk-cache.c
index 024a8fc93069..0d227ef7d1b9 100644
--- a/drivers/lightnvm/pblk-cache.c
+++ b/drivers/lightnvm/pblk-cache.c
@@ -43,8 +43,10 @@ retry:
         if (unlikely(!bio_has_data(bio)))
                 goto out;
 
-        w_ctx.flags = flags;
         pblk_ppa_set_empty(&w_ctx.ppa);
+        w_ctx.flags = flags;
+        if (bio->bi_opf & REQ_PREFLUSH)
+                w_ctx.flags |= PBLK_FLUSH_ENTRY;
 
         for (i = 0; i < nr_entries; i++) {
                 void *data = bio_data(bio);
@@ -73,12 +75,11 @@ out:
  * On GC the incoming lbas are not necessarily sequential. Also, some of the
  * lbas might not be valid entries, which are marked as empty by the GC thread
  */
-int pblk_write_gc_to_cache(struct pblk *pblk, void *data, u64 *lba_list,
-                           unsigned int nr_entries, unsigned int nr_rec_entries,
-                           struct pblk_line *gc_line, unsigned long flags)
+int pblk_write_gc_to_cache(struct pblk *pblk, struct pblk_gc_rq *gc_rq)
 {
         struct pblk_w_ctx w_ctx;
         unsigned int bpos, pos;
+        void *data = gc_rq->data;
         int i, valid_entries;
 
         /* Update the write buffer head (mem) with the entries that we can
@@ -86,28 +87,29 @@ int pblk_write_gc_to_cache(struct pblk *pblk, void *data, u64 *lba_list,
          * rollback from here on.
          */
 retry:
-        if (!pblk_rb_may_write_gc(&pblk->rwb, nr_rec_entries, &bpos)) {
+        if (!pblk_rb_may_write_gc(&pblk->rwb, gc_rq->secs_to_gc, &bpos)) {
                 io_schedule();
                 goto retry;
         }
 
-        w_ctx.flags = flags;
+        w_ctx.flags = PBLK_IOTYPE_GC;
         pblk_ppa_set_empty(&w_ctx.ppa);
 
-        for (i = 0, valid_entries = 0; i < nr_entries; i++) {
-                if (lba_list[i] == ADDR_EMPTY)
+        for (i = 0, valid_entries = 0; i < gc_rq->nr_secs; i++) {
+                if (gc_rq->lba_list[i] == ADDR_EMPTY)
                         continue;
 
-                w_ctx.lba = lba_list[i];
+                w_ctx.lba = gc_rq->lba_list[i];
 
                 pos = pblk_rb_wrap_pos(&pblk->rwb, bpos + valid_entries);
-                pblk_rb_write_entry_gc(&pblk->rwb, data, w_ctx, gc_line, pos);
+                pblk_rb_write_entry_gc(&pblk->rwb, data, w_ctx, gc_rq->line,
+                                                gc_rq->paddr_list[i], pos);
 
                 data += PBLK_EXPOSED_PAGE_SIZE;
                 valid_entries++;
         }
 
-        WARN_ONCE(nr_rec_entries != valid_entries,
+        WARN_ONCE(gc_rq->secs_to_gc != valid_entries,
                                         "pblk: inconsistent GC write\n");
 
 #ifdef CONFIG_NVM_DEBUG