From 63dee3a6c39a5bfa5f299ebb314f2e3e0273092b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Javier=20Gonz=C3=A1lez?= <javier@javigon.com>
Date: Tue, 9 Oct 2018 13:11:57 +0200
Subject: [PATCH] lightnvm: pblk: calculate line pad distance in helper
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
If a line is padded, calculate the pad distance directly on the helper
being used for this purpose.
Signed-off-by: Javier González <javier@cnexlabs.com>
Signed-off-by: Matias Bjørling <mb@lightnvm.io>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---
drivers/lightnvm/pblk-recovery.c | 13 ++++++++++---
drivers/lightnvm/pblk.h | 8 --------
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/drivers/lightnvm/pblk-recovery.c b/drivers/lightnvm/pblk-recovery.c
index 0322ab915ddcb..8036c3eb63724 100644
--- a/drivers/lightnvm/pblk-recovery.c
+++ b/drivers/lightnvm/pblk-recovery.c
@@ -380,6 +380,15 @@ fail_free_pad:
return ret;
}
+static int pblk_pad_distance(struct pblk *pblk, struct pblk_line *line)
+{
+ struct nvm_tgt_dev *dev = pblk->dev;
+ struct nvm_geo *geo = &dev->geo;
+ int distance = geo->mw_cunits * geo->all_luns * geo->ws_opt;
+
+ return (distance > line->left_msecs) ? line->left_msecs : distance;
+}
+
/* When this function is called, it means that not all upper pages have been
* written in a page that contains valid data. In order to recover this data, we
* first find the write pointer on the device, then we pad all necessary
@@ -495,9 +504,7 @@ next_rq:
line->left_msecs += nr_error_bits;
bitmap_clear(line->map_bitmap, line->cur_sec, nr_error_bits);
- pad_secs = pblk_pad_distance(pblk);
- if (pad_secs > line->left_msecs)
- pad_secs = line->left_msecs;
+ pad_secs = pblk_pad_distance(pblk, line);
ret = pblk_recov_pad_oob(pblk, line, pad_secs);
if (ret)
diff --git a/drivers/lightnvm/pblk.h b/drivers/lightnvm/pblk.h
index a2cc581951ef7..d123cff82589b 100644
--- a/drivers/lightnvm/pblk.h
+++ b/drivers/lightnvm/pblk.h
@@ -986,14 +986,6 @@ static inline int pblk_line_vsc(struct pblk_line *line)
return le32_to_cpu(*line->vsc);
}
-static inline int pblk_pad_distance(struct pblk *pblk)
-{
- struct nvm_tgt_dev *dev = pblk->dev;
- struct nvm_geo *geo = &dev->geo;
-
- return geo->mw_cunits * geo->all_luns * geo->ws_opt;
-}
-
static inline int pblk_ppa_to_line_id(struct ppa_addr p)
{
return p.a.blk;
--
2.30.2