| Message ID | 1451994218-5871-1-git-send-email-ww.tao0320@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 01/05/2016 12:43 PM, Wenwei Tao wrote: > There is no need to check whether dev's pages per block is > beyond rrpc support everytime we init a lun, we only need > to check it once before enter the lun init loop. > > Signed-off-by: Wenwei Tao <ww.tao0320@gmail.com> > --- > drivers/lightnvm/rrpc.c | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/drivers/lightnvm/rrpc.c b/drivers/lightnvm/rrpc.c > index 27fb98d..286a038 100644 > --- a/drivers/lightnvm/rrpc.c > +++ b/drivers/lightnvm/rrpc.c > @@ -1087,6 +1087,11 @@ static int rrpc_luns_init(struct rrpc *rrpc, int lun_begin, int lun_end) > struct rrpc_lun *rlun; > int i, j; > > + if (dev->pgs_per_blk > MAX_INVALID_PAGES_STORAGE * BITS_PER_LONG) { > + pr_err("rrpc: number of pages per block too high."); > + return -EINVAL; > + } > + > spin_lock_init(&rrpc->rev_lock); > > rrpc->luns = kcalloc(rrpc->nr_luns, sizeof(struct rrpc_lun), > @@ -1098,12 +1103,6 @@ static int rrpc_luns_init(struct rrpc *rrpc, int lun_begin, int lun_end) > for (i = 0; i < rrpc->nr_luns; i++) { > struct nvm_lun *lun = dev->mt->get_lun(dev, lun_begin + i); > > - if (dev->pgs_per_blk > > - MAX_INVALID_PAGES_STORAGE * BITS_PER_LONG) { > - pr_err("rrpc: number of pages per block too high."); > - goto err; > - } > - > rlun = &rrpc->luns[i]; > rlun->rrpc = rrpc; > rlun->parent = lun; > Thanks. Leftover from when luns could have different number of pages. Applied for 4.5. -- To unsubscribe from this list: send the line "unsubscribe linux-block" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/lightnvm/rrpc.c b/drivers/lightnvm/rrpc.c index 27fb98d..286a038 100644 --- a/drivers/lightnvm/rrpc.c +++ b/drivers/lightnvm/rrpc.c @@ -1087,6 +1087,11 @@ static int rrpc_luns_init(struct rrpc *rrpc, int lun_begin, int lun_end) struct rrpc_lun *rlun; int i, j; + if (dev->pgs_per_blk > MAX_INVALID_PAGES_STORAGE * BITS_PER_LONG) { + pr_err("rrpc: number of pages per block too high."); + return -EINVAL; + } + spin_lock_init(&rrpc->rev_lock); rrpc->luns = kcalloc(rrpc->nr_luns, sizeof(struct rrpc_lun), @@ -1098,12 +1103,6 @@ static int rrpc_luns_init(struct rrpc *rrpc, int lun_begin, int lun_end) for (i = 0; i < rrpc->nr_luns; i++) { struct nvm_lun *lun = dev->mt->get_lun(dev, lun_begin + i); - if (dev->pgs_per_blk > - MAX_INVALID_PAGES_STORAGE * BITS_PER_LONG) { - pr_err("rrpc: number of pages per block too high."); - goto err; - } - rlun = &rrpc->luns[i]; rlun->rrpc = rrpc; rlun->parent = lun;
There is no need to check whether dev's pages per block is beyond rrpc support everytime we init a lun, we only need to check it once before enter the lun init loop. Signed-off-by: Wenwei Tao <ww.tao0320@gmail.com> --- drivers/lightnvm/rrpc.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)