summaryrefslogtreecommitdiffstats
path: root/drivers/lightnvm
diff options
context:
space:
mode:
authorIgor Konopko2019-05-04 20:38:07 +0200
committerJens Axboe2019-05-06 18:19:19 +0200
commita24eab59887133032831f939ad172233e7acb36e (patch)
tree65b3817ac455f412d2a825cd6c7bbc15c296668e /drivers/lightnvm
parentlightnvm: pblk: IO path reorganization (diff)
downloadkernel-qcow2-linux-a24eab59887133032831f939ad172233e7acb36e.tar.gz
kernel-qcow2-linux-a24eab59887133032831f939ad172233e7acb36e.tar.xz
kernel-qcow2-linux-a24eab59887133032831f939ad172233e7acb36e.zip
lightnvm: pblk: recover only written metadata
This patch ensures that smeta was fully written before even trying to read it based on chunk table state and write pointer. Signed-off-by: Igor Konopko <igor.j.konopko@intel.com> Signed-off-by: Matias Bjørling <mb@lightnvm.io> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/lightnvm')
-rw-r--r--drivers/lightnvm/pblk-recovery.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/lightnvm/pblk-recovery.c b/drivers/lightnvm/pblk-recovery.c
index 865fe310cab4..a9085b0e6611 100644
--- a/drivers/lightnvm/pblk-recovery.c
+++ b/drivers/lightnvm/pblk-recovery.c
@@ -655,10 +655,12 @@ static int pblk_line_was_written(struct pblk_line *line,
bppa = pblk->luns[smeta_blk].bppa;
chunk = &line->chks[pblk_ppa_to_pos(geo, bppa)];
- if (chunk->state & NVM_CHK_ST_FREE)
- return 0;
+ if (chunk->state & NVM_CHK_ST_CLOSED ||
+ (chunk->state & NVM_CHK_ST_OPEN
+ && chunk->wp >= lm->smeta_sec))
+ return 1;
- return 1;
+ return 0;
}
static bool pblk_line_is_open(struct pblk *pblk, struct pblk_line *line)