| Message ID | 1449232672-3464-1-git-send-email-ww.tao0320@gmail.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Jens Axboe |
| Headers | show |
On 12/04/2015 01:37 PM, Wenwei Tao wrote: > move spin_unlock(&vlun->lock) to common path to make > the code more clean. > > Signed-off-by: Wenwei Tao <ww.tao0320@gmail.com> > --- > drivers/lightnvm/gennvm.c | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/drivers/lightnvm/gennvm.c b/drivers/lightnvm/gennvm.c > index 35dde84..ce60254 100644 > --- a/drivers/lightnvm/gennvm.c > +++ b/drivers/lightnvm/gennvm.c > @@ -262,14 +262,11 @@ static struct nvm_block *gennvm_get_blk(struct nvm_dev *dev, > if (list_empty(&lun->free_list)) { > pr_err_ratelimited("gennvm: lun %u have no free pages available", > lun->vlun.id); > - spin_unlock(&vlun->lock); > goto out; > } > > - while (!is_gc && lun->vlun.nr_free_blocks < lun->reserved_blocks) { > - spin_unlock(&vlun->lock); > + if (!is_gc && lun->vlun.nr_free_blocks < lun->reserved_blocks) > goto out; > - } > > blk = list_first_entry(&lun->free_list, struct nvm_block, list); > list_move_tail(&blk->list, &lun->used_list); > @@ -278,8 +275,8 @@ static struct nvm_block *gennvm_get_blk(struct nvm_dev *dev, > lun->vlun.nr_free_blocks--; > lun->vlun.nr_inuse_blocks++; > > - spin_unlock(&vlun->lock); > out: > + spin_unlock(&vlun->lock); > return blk; > } > > Thanks Tao, applied. -- 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/gennvm.c b/drivers/lightnvm/gennvm.c index 35dde84..ce60254 100644 --- a/drivers/lightnvm/gennvm.c +++ b/drivers/lightnvm/gennvm.c @@ -262,14 +262,11 @@ static struct nvm_block *gennvm_get_blk(struct nvm_dev *dev, if (list_empty(&lun->free_list)) { pr_err_ratelimited("gennvm: lun %u have no free pages available", lun->vlun.id); - spin_unlock(&vlun->lock); goto out; } - while (!is_gc && lun->vlun.nr_free_blocks < lun->reserved_blocks) { - spin_unlock(&vlun->lock); + if (!is_gc && lun->vlun.nr_free_blocks < lun->reserved_blocks) goto out; - } blk = list_first_entry(&lun->free_list, struct nvm_block, list); list_move_tail(&blk->list, &lun->used_list); @@ -278,8 +275,8 @@ static struct nvm_block *gennvm_get_blk(struct nvm_dev *dev, lun->vlun.nr_free_blocks--; lun->vlun.nr_inuse_blocks++; - spin_unlock(&vlun->lock); out: + spin_unlock(&vlun->lock); return blk; }
move spin_unlock(&vlun->lock) to common path to make the code more clean. Signed-off-by: Wenwei Tao <ww.tao0320@gmail.com> --- drivers/lightnvm/gennvm.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)