diff options
| author | Juergen Gross <jgross@suse.com> | 2016-02-08 15:30:18 +0100 |
|---|---|---|
| committer | David Vrabel <david.vrabel@citrix.com> | 2016-02-08 16:44:40 +0000 |
| commit | f285aa8db7cc4432c1a03f8b55ff34fe96317c11 (patch) | |
| tree | 66a8e6ac3118ac726974bdc0ae04b9ea8a7f830b /drivers/xen | |
| parent | a4cdb556cae05cd3e7b602b3a44c01420c4e2258 (diff) | |
| download | linux-f285aa8db7cc4432c1a03f8b55ff34fe96317c11.tar.bz2 | |
xen/scsiback: correct frontend counting
When adding a new frontend to xen-scsiback don't decrement the number
of active frontends in case of no error. Doing so results in a failure
when trying to remove the xen-pvscsi nexus even if no domain is using
it.
Signed-off-by: Juergen Gross <jgross@suse.com>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: stable@vger.kernel.org
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
Diffstat (limited to 'drivers/xen')
| -rw-r--r-- | drivers/xen/xen-scsiback.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/xen/xen-scsiback.c b/drivers/xen/xen-scsiback.c index ad4eb1024d1f..51387d75c7bf 100644 --- a/drivers/xen/xen-scsiback.c +++ b/drivers/xen/xen-scsiback.c @@ -939,12 +939,12 @@ out: spin_unlock_irqrestore(&info->v2p_lock, flags); out_free: - mutex_lock(&tpg->tv_tpg_mutex); - tpg->tv_tpg_fe_count--; - mutex_unlock(&tpg->tv_tpg_mutex); - - if (err) + if (err) { + mutex_lock(&tpg->tv_tpg_mutex); + tpg->tv_tpg_fe_count--; + mutex_unlock(&tpg->tv_tpg_mutex); kfree(new); + } return err; } |