3 files changed, 9 insertions, 27 deletions

diff --git a/drivers/lightnvm/pblk-core.c b/drivers/lightnvm/pblk-core.c
index 8536d38ef97e..a68c6ae536e5 100644
--- a/drivers/lightnvm/pblk-core.c
+++ b/drivers/lightnvm/pblk-core.c
@@ -1591,8 +1591,6 @@ void pblk_line_close(struct pblk *pblk, struct pblk_line *line)
 
         spin_unlock(&line->lock);
         spin_unlock(&l_mg->gc_lock);
-
-        pblk_gc_should_kick(pblk);
 }
 
 void pblk_line_close_meta(struct pblk *pblk, struct pblk_line *line)
diff --git a/drivers/lightnvm/pblk-rl.c b/drivers/lightnvm/pblk-rl.c
index 2e6a5361baf0..9565c3bc4d0b 100644
--- a/drivers/lightnvm/pblk-rl.c
+++ b/drivers/lightnvm/pblk-rl.c
@@ -96,9 +96,11 @@ unsigned long pblk_rl_nr_free_blks(struct pblk_rl *rl)
  *
  * Only the total number of free blocks is used to configure the rate limiter.
  */
-static int pblk_rl_update_rates(struct pblk_rl *rl, unsigned long max)
+static void pblk_rl_update_rates(struct pblk_rl *rl)
 {
+        struct pblk *pblk = container_of(rl, struct pblk, rl);
         unsigned long free_blocks = pblk_rl_nr_free_blks(rl);
+        int max = rl->rb_budget;
 
         if (free_blocks >= rl->high) {
                 rl->rb_user_max = max;
@@ -124,23 +126,18 @@ static int pblk_rl_update_rates(struct pblk_rl *rl, unsigned long max)
                 rl->rb_state = PBLK_RL_LOW;
         }
 
-        return rl->rb_state;
+        if (rl->rb_state == (PBLK_RL_MID | PBLK_RL_LOW))
+                pblk_gc_should_start(pblk);
+        else
+                pblk_gc_should_stop(pblk);
 }
 
 void pblk_rl_free_lines_inc(struct pblk_rl *rl, struct pblk_line *line)
 {
-        struct pblk *pblk = container_of(rl, struct pblk, rl);
         int blk_in_line = atomic_read(&line->blk_in_line);
-        int ret;
 
         atomic_add(blk_in_line, &rl->free_blocks);
-        /* Rates will not change that often - no need to lock update */
-        ret = pblk_rl_update_rates(rl, rl->rb_budget);
-
-        if (ret == (PBLK_RL_MID | PBLK_RL_LOW))
-                pblk_gc_should_start(pblk);
-        else
-                pblk_gc_should_stop(pblk);
+        pblk_rl_update_rates(rl);
 }
 
 void pblk_rl_free_lines_dec(struct pblk_rl *rl, struct pblk_line *line)
@@ -148,19 +145,7 @@ void pblk_rl_free_lines_dec(struct pblk_rl *rl, struct pblk_line *line)
         int blk_in_line = atomic_read(&line->blk_in_line);
 
         atomic_sub(blk_in_line, &rl->free_blocks);
-}
-
-void pblk_gc_should_kick(struct pblk *pblk)
-{
-        struct pblk_rl *rl = &pblk->rl;
-        int ret;
-
-        /* Rates will not change that often - no need to lock update */
-        ret = pblk_rl_update_rates(rl, rl->rb_budget);
-        if (ret == (PBLK_RL_MID | PBLK_RL_LOW))
-                pblk_gc_should_start(pblk);
-        else
-                pblk_gc_should_stop(pblk);
+        pblk_rl_update_rates(rl);
 }
 
 int pblk_rl_high_thrs(struct pblk_rl *rl)
diff --git a/drivers/lightnvm/pblk.h b/drivers/lightnvm/pblk.h
index 9ece409993fe..3a07c5b61a0c 100644
--- a/drivers/lightnvm/pblk.h
+++ b/drivers/lightnvm/pblk.h
@@ -824,7 +824,6 @@ int pblk_gc_init(struct pblk *pblk);
 void pblk_gc_exit(struct pblk *pblk);
 void pblk_gc_should_start(struct pblk *pblk);
 void pblk_gc_should_stop(struct pblk *pblk);
-void pblk_gc_should_kick(struct pblk *pblk);
 void pblk_gc_kick(struct pblk *pblk);
 void pblk_gc_sysfs_state_show(struct pblk *pblk, int *gc_enabled,
                               int *gc_active);