| Message ID | 1460536072-1728-1-git-send-email-ww.tao0320@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 04/13/2016 10:27 AM, Wenwei Tao wrote: > Calculate rrpc total blocks and sectors up front, make sense > to use them. For example, we use rrpc->nr_sects to calculate rrpc > area size, but it makes no sense if we don't initialize it up front, > since it would be zero until we finish rrpc luns init. > > Signed-off-by: Wenwei Tao <ww.tao0320@gmail.com> > --- > drivers/lightnvm/rrpc.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/lightnvm/rrpc.c b/drivers/lightnvm/rrpc.c > index 3ab6495..c0e303c 100644 > --- a/drivers/lightnvm/rrpc.c > +++ b/drivers/lightnvm/rrpc.c > @@ -1207,10 +1207,6 @@ static int rrpc_luns_init(struct rrpc *rrpc, int lun_begin, int lun_end) > > INIT_WORK(&rlun->ws_gc, rrpc_lun_gc); > spin_lock_init(&rlun->lock); > - > - rrpc->total_blocks += dev->blks_per_lun; > - rrpc->nr_sects += dev->sec_per_lun; > - > } > > return 0; > @@ -1388,6 +1384,8 @@ static void *rrpc_init(struct nvm_dev *dev, struct gendisk *tdisk, > INIT_WORK(&rrpc->ws_requeue, rrpc_requeue); > > rrpc->nr_luns = lun_end - lun_begin + 1; > + rrpc->total_blocks = (unsigned long)dev->blks_per_lun * rrpc->nr_luns; > + rrpc->nr_sects = (unsigned long long)dev->sec_per_lun * rrpc->nr_luns; > > /* simple round-robin strategy */ > atomic_set(&rrpc->next_lun, -1); > Thanks Wenwei. Applied for 4.7. -- 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 3ab6495..c0e303c 100644 --- a/drivers/lightnvm/rrpc.c +++ b/drivers/lightnvm/rrpc.c @@ -1207,10 +1207,6 @@ static int rrpc_luns_init(struct rrpc *rrpc, int lun_begin, int lun_end) INIT_WORK(&rlun->ws_gc, rrpc_lun_gc); spin_lock_init(&rlun->lock); - - rrpc->total_blocks += dev->blks_per_lun; - rrpc->nr_sects += dev->sec_per_lun; - } return 0; @@ -1388,6 +1384,8 @@ static void *rrpc_init(struct nvm_dev *dev, struct gendisk *tdisk, INIT_WORK(&rrpc->ws_requeue, rrpc_requeue); rrpc->nr_luns = lun_end - lun_begin + 1; + rrpc->total_blocks = (unsigned long)dev->blks_per_lun * rrpc->nr_luns; + rrpc->nr_sects = (unsigned long long)dev->sec_per_lun * rrpc->nr_luns; /* simple round-robin strategy */ atomic_set(&rrpc->next_lun, -1);
Calculate rrpc total blocks and sectors up front, make sense to use them. For example, we use rrpc->nr_sects to calculate rrpc area size, but it makes no sense if we don't initialize it up front, since it would be zero until we finish rrpc luns init. Signed-off-by: Wenwei Tao <ww.tao0320@gmail.com> --- drivers/lightnvm/rrpc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)