2015-12-04 12:45:41

by Wenwei Tao

Subject: [PATCH] lightnvm: place unlock sentence in the common path

move spin_unlock(&vlun->lock) to common path to make
the code more clean.

Signed-off-by: Wenwei Tao <[email protected]>
---
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;
}

--
1.8.3.1

2015-12-04 12:50:36

by Matias Bjørling

Subject: Re: [PATCH] lightnvm: place unlock sentence in the common path

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 <[email protected]>
> ---
> 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.