OSDN Git Service

lightnvm: pblk: ignore the smeta oob area scan
authorZhoujie Wu <zjwu@marvell.com>
Tue, 11 Dec 2018 19:16:07 +0000 (20:16 +0100)
committerJens Axboe <axboe@kernel.dk>
Tue, 11 Dec 2018 19:22:33 +0000 (12:22 -0700)
The smeta area l2p mapping is empty, and actually the
recovery procedure only need to restore data sector's l2p
mapping. So ignore the smeta oob scan.

Signed-off-by: Zhoujie Wu <zjwu@marvell.com>
Reviewed-by: Javier González <javier@javigon.com>
Reviewed-by: Hans Holmberg <hans.holmberg@cnexlabs.com>
Signed-off-by: Matias Bjørling <mb@lightnvm.io>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/lightnvm/pblk-recovery.c

index 5740b75..0fbd30e 100644 (file)
@@ -334,6 +334,7 @@ static int pblk_recov_scan_oob(struct pblk *pblk, struct pblk_line *line,
                               struct pblk_recov_alloc p)
 {
        struct nvm_tgt_dev *dev = pblk->dev;
+       struct pblk_line_meta *lm = &pblk->lm;
        struct nvm_geo *geo = &dev->geo;
        struct ppa_addr *ppa_list;
        struct pblk_sec_meta *meta_list;
@@ -342,12 +343,12 @@ static int pblk_recov_scan_oob(struct pblk *pblk, struct pblk_line *line,
        void *data;
        dma_addr_t dma_ppa_list, dma_meta_list;
        __le64 *lba_list;
-       u64 paddr = 0;
+       u64 paddr = pblk_line_smeta_start(pblk, line) + lm->smeta_sec;
        bool padded = false;
        int rq_ppas, rq_len;
        int i, j;
        int ret;
-       u64 left_ppas = pblk_sec_in_open_line(pblk, line);
+       u64 left_ppas = pblk_sec_in_open_line(pblk, line) - lm->smeta_sec;
 
        if (pblk_line_wp_is_unbalanced(pblk, line))
                pblk_warn(pblk, "recovering unbalanced line (%d)\n", line->id);