diff options
| author | Wenwei Tao <ww.tao0320@gmail.com> | 2015-12-06 11:25:45 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-12-07 09:14:19 -0700 |
| commit | e9b76a80f1f165cb031f62128dc07d219e29f5a3 (patch) | |
| tree | 65a686e68c156534c4be0dc57fc84a6457db0c1a /drivers/lightnvm | |
| parent | d3d1a43842077c53e22dedaebfe7cb52022b18e1 (diff) | |
| download | lwn-e9b76a80f1f165cb031f62128dc07d219e29f5a3.tar.gz lwn-e9b76a80f1f165cb031f62128dc07d219e29f5a3.zip | |
lightnvm: refactor spin_unlock in gennvm_get_blk
The spin_unlock is duplicated multiple times. Jump to a single unlock
to improve the code flow.
Signed-off-by: Wenwei Tao <ww.tao0320@gmail.com>
Signed-off-by: Matias Bjørling <m@bjorling.me>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/lightnvm')
| -rw-r--r-- | drivers/lightnvm/gennvm.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/lightnvm/gennvm.c b/drivers/lightnvm/gennvm.c index 35dde84b71e9..ce6025487a5c 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; } |