From owner-svn-src-all@FreeBSD.ORG  Tue Jun  3 21:31:28 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C3EBAF8F;
 Tue,  3 Jun 2014 21:31:28 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B1C7D2D25;
 Tue,  3 Jun 2014 21:31:28 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s53LVS3l098607;
 Tue, 3 Jun 2014 21:31:28 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s53LVSkp098606;
 Tue, 3 Jun 2014 21:31:28 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201406032131.s53LVSkp098606@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Tue, 3 Jun 2014 21:31:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r267030 - head/sys/dev/hpt27xx
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Jun 2014 21:31:28 -0000

Author: delphij
Date: Tue Jun  3 21:31:28 2014
New Revision: 267030
URL: http://svnweb.freebsd.org/changeset/base/267030

Log:
  Don't leak Giant.
  
  Noticed by:	Sascha Wildner (DragonFlyBSD) via IRC
  Reviewed by:	mav
  MFC after:	3 days

Modified:
  head/sys/dev/hpt27xx/hpt27xx_osm_bsd.c

Modified: head/sys/dev/hpt27xx/hpt27xx_osm_bsd.c
==============================================================================
--- head/sys/dev/hpt27xx/hpt27xx_osm_bsd.c	Tue Jun  3 21:06:03 2014	(r267029)
+++ head/sys/dev/hpt27xx/hpt27xx_osm_bsd.c	Tue Jun  3 21:31:28 2014	(r267030)
@@ -1345,17 +1345,19 @@ static int	hpt_rescan_bus(void)
 	ldm_for_each_vbus(vbus, vbus_ext) {
 		if ((ccb = xpt_alloc_ccb()) == NULL)
 		{
+			mtx_unlock(&Giant);
 			return(ENOMEM);
 		}
 		if (xpt_create_path(&ccb->ccb_h.path, NULL, cam_sim_path(vbus_ext->sim),
 			CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD) != CAM_REQ_CMP)	
 		{
 			xpt_free_ccb(ccb);
+			mtx_unlock(&Giant);
 			return(EIO);
 		}
 		xpt_rescan(ccb);
 	}
 	mtx_unlock(&Giant);
-	return(0);	
+	return(0);
 }