[1/6] lightnvm: pblk: reuse pblk_gc_should_kick

Commit Message

Rakesh Pandit Sept. 21, 2017, 11:25 a.m. UTC

This is a trivial change which reuses pblk_gc_should_kick instead of
repeating it again in pblk_rl_free_lines_inc.

Signed-off-by: Rakesh Pandit <[e-mail]>
---
 drivers/lightnvm/pblk-core.c | 1 +
 drivers/lightnvm/pblk-rl.c   | 9 ---------
 2 files changed, 1 insertion(+), 9 deletions(-)

Patch

diff --git a/drivers/lightnvm/pblk-core.c b/drivers/lightnvm/pblk-core.c
index 64a6a25..a230125 100644
--- a/drivers/lightnvm/pblk-core.c
+++ b/drivers/lightnvm/pblk-core.c
@@ -1478,6 +1478,7 @@  static void __pblk_line_put(struct pblk *pblk, struct pblk_line *line)
 	spin_unlock(&l_mg->free_lock);
 
 	pblk_rl_free_lines_inc(&pblk->rl, line);
+	pblk_gc_should_kick(pblk);
 }
 
 static void pblk_line_put_ws(struct work_struct *work)
diff --git a/drivers/lightnvm/pblk-rl.c b/drivers/lightnvm/pblk-rl.c
index 596bdec..e7c162a 100644
--- a/drivers/lightnvm/pblk-rl.c
+++ b/drivers/lightnvm/pblk-rl.c
@@ -129,18 +129,9 @@  static int pblk_rl_update_rates(struct pblk_rl *rl, unsigned long max)
 
 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);
 }
 
 void pblk_rl_free_lines_dec(struct pblk_rl *rl, struct pblk_line *line)