Commit f285aa8d authored Feb 08, 2016 by Juergen Gross Committed by David Vrabel Feb 08, 2016

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>

parent a4cdb556

drivers/xen/xen-scsiback.c

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -939,12 +939,12 @@ static int scsiback_add_translation_entry(struct vscsibk_info *info,
	spin_unlock_irqrestore(&info->v2p_lock, flags);		spin_unlock_irqrestore(&info->v2p_lock, flags);

	out_free:		out_free:
			if (err) {
	mutex_lock(&tpg->tv_tpg_mutex);		mutex_lock(&tpg->tv_tpg_mutex);
	tpg->tv_tpg_fe_count--;		tpg->tv_tpg_fe_count--;
	mutex_unlock(&tpg->tv_tpg_mutex);		mutex_unlock(&tpg->tv_tpg_mutex);

	if (err)
	kfree(new);		kfree(new);
			}

	return err;		return err;
	}		}