diff options
| author | Jens Axboe <axboe@fb.com> | 2014-07-01 16:19:04 (GMT) |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-07-01 16:19:04 (GMT) |
| commit | 17737d3b5997ac9f810967f0c6014d124ec39490 (patch) | |
| tree | 5ee591a925382668d669fe5db3c3d1067f7340e8 /drivers | |
| parent | 4c834452aad01531db949414f94f817a86348d59 (diff) | |
| parent | 2d7227828e1475c7b272e55bd70c4cec8eea219a (diff) | |
| download | linux-17737d3b5997ac9f810967f0c6014d124ec39490.tar.xz | |
Merge branch 'for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu into for-3.17/core
Merge the percpu_ref changes from Tejun, he says they are stable now.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/target/target_core_tpg.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/target/target_core_tpg.c b/drivers/target/target_core_tpg.c index c036595..fddfae6 100644 --- a/drivers/target/target_core_tpg.c +++ b/drivers/target/target_core_tpg.c @@ -825,7 +825,7 @@ int core_tpg_add_lun( ret = core_dev_export(dev, tpg, lun); if (ret < 0) { - percpu_ref_cancel_init(&lun->lun_ref); + percpu_ref_exit(&lun->lun_ref); return ret; } @@ -880,5 +880,7 @@ int core_tpg_post_dellun( lun->lun_status = TRANSPORT_LUN_STATUS_FREE; spin_unlock(&tpg->tpg_lun_lock); + percpu_ref_exit(&lun->lun_ref); + return 0; } |