lightnvm: pblk: use constant for GC max inflight

Use a constant to set the maximum number of inflight GC requests
allowed.

Signed-off-by: Javier González <javier@cnexlabs.com>
Signed-off-by: Matias Bjørling <m@bjorling.me>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/lightnvm/pblk-gc.c b/drivers/lightnvm/pblk-gc.c
index f163829ecca826afc0397784b43ea4cfd71b48f8..c21b2077432a0e664cc11af022546416b7c73f9d 100644 (file)
--- a/drivers/lightnvm/pblk-gc.c
+++ b/drivers/lightnvm/pblk-gc.c
@@ -93,7 +93,7 @@ static int pblk_gc_move_valid_secs(struct pblk *pblk, struct pblk_gc_rq *gc_rq)
 
 retry:
        spin_lock(&gc->w_lock);
-       if (gc->w_entries >= PBLK_GC_W_QD) {
+       if (gc->w_entries >= PBLK_GC_RQ_QD) {
                spin_unlock(&gc->w_lock);
                pblk_gc_writer_kick(&pblk->gc);
                usleep_range(128, 256);
@@ -602,7 +602,7 @@ int pblk_gc_init(struct pblk *pblk)
        spin_lock_init(&gc->w_lock);
        spin_lock_init(&gc->r_lock);
 
-       sema_init(&gc->gc_sem, 128);
+       sema_init(&gc->gc_sem, PBLK_GC_RQ_QD);
 
        INIT_LIST_HEAD(&gc->w_list);
        INIT_LIST_HEAD(&gc->r_list);

diff --git a/drivers/lightnvm/pblk.h b/drivers/lightnvm/pblk.h
index 60edcda0fc7f7428f8a0bd055382c716805cb2d3..baa6a633990faf5d97d9757637b3ccdbc7c84dc2 100644 (file)
--- a/drivers/lightnvm/pblk.h
+++ b/drivers/lightnvm/pblk.h
@@ -816,7 +816,7 @@ int pblk_recov_setup_rq(struct pblk *pblk, struct pblk_c_ctx *c_ctx,
  * pblk gc
  */
 #define PBLK_GC_MAX_READERS 8  /* Max number of outstanding GC reader jobs */
-#define PBLK_GC_W_QD 128       /* Queue depth for inflight GC write I/Os */
+#define PBLK_GC_RQ_QD 128      /* Queue depth for inflight GC requests */
 #define PBLK_GC_L_QD 4         /* Queue depth for inflight GC lines */
 #define PBLK_GC_RSV_LINE 1     /* Reserved lines for GC */