Skip to content

Commit

Permalink
lightnvm: pblk: calculate line pad distance in helper
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Javier González authored and Jens Axboe committed Oct 9, 2018
1 parent 7f985f9 commit 63dee3a
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 11 deletions.
13 changes: 10 additions & 3 deletions drivers/lightnvm/pblk-recovery.c
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,15 @@ static int pblk_recov_pad_oob(struct pblk *pblk, struct pblk_line *line,
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
Expand Down Expand Up @@ -495,9 +504,7 @@ static int pblk_recov_scan_all_oob(struct pblk *pblk, struct pblk_line *line,
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)
Expand Down
8 changes: 0 additions & 8 deletions drivers/lightnvm/pblk.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 63dee3a

Please sign in to comment.