All of lore.kernel.org
 help / color / mirror / Atom feed
From: Juergen Gross <jgross@suse.com>
To: linux-kernel@vger.kernel.org, xen-devel@lists.xen.org,
	konrad.wilk@oracle.com, david.vrabel@citrix.com,
	boris.ostrovsky@oracle.com
Cc: Juergen Gross <jgross@suse.com>, stable@vger.kernel.org
Subject: [PATCH v2 1/2] xen/scsiback: correct frontend counting
Date: Mon,  8 Feb 2016 15:30:18 +0100	[thread overview]
Message-ID: <1454941819-24513-2-git-send-email-jgross@suse.com> (raw)
In-Reply-To: <1454941819-24513-1-git-send-email-jgross@suse.com>

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
---
 drivers/xen/xen-scsiback.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/xen/xen-scsiback.c b/drivers/xen/xen-scsiback.c
index ad4eb10..51387d7 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;
 }
-- 
2.6.2

  parent reply	other threads:[~2016-02-08 14:30 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-08 14:30 [PATCH v2 0/2] xen/scsiback: correct two issues Juergen Gross
2016-02-08 14:30 ` [PATCH v2 1/2] xen/scsiback: correct frontend counting Juergen Gross
2016-02-08 14:30 ` Juergen Gross [this message]
2016-02-08 14:30 ` [PATCH v2 2/2] xen/scsiback: avoid warnings when adding multiple LUNs to a domain Juergen Gross
2016-02-08 14:30 ` Juergen Gross
2016-02-08 15:44   ` Boris Ostrovsky
2016-02-08 15:44   ` Boris Ostrovsky
2016-02-08 16:46   ` [Xen-devel] " David Vrabel
2016-02-08 16:50     ` Juergen Gross
2016-02-08 16:50     ` [Xen-devel] " Juergen Gross
2016-02-08 16:52       ` David Vrabel
2016-02-08 16:52       ` [Xen-devel] " David Vrabel
2016-02-08 16:46   ` David Vrabel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1454941819-24513-2-git-send-email-jgross@suse.com \
    --to=jgross@suse.com \
    --cc=boris.ostrovsky@oracle.com \
    --cc=david.vrabel@citrix.com \
    --cc=konrad.wilk@oracle.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    --cc=xen-devel@lists.xen.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.