From owner-svn-src-all@FreeBSD.ORG  Sun Jul 31 13:49:16 2011
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 13C491065675;
	Sun, 31 Jul 2011 13:49:16 +0000 (UTC)
	(envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 036D38FC12;
	Sun, 31 Jul 2011 13:49:16 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p6VDnF9l048711;
	Sun, 31 Jul 2011 13:49:15 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6VDnFC6048709;
	Sun, 31 Jul 2011 13:49:15 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201107311349.p6VDnFC6048709@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Sun, 31 Jul 2011 13:49:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r224546 - head/sys/kern
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Sun, 31 Jul 2011 13:49:16 -0000

Author: glebius
Date: Sun Jul 31 13:49:15 2011
New Revision: 224546
URL: http://svn.freebsd.org/changeset/base/224546

Log:
  Don't leak kld_sx lock in kldunloadf().
  
  Approved by:	re (kib)

Modified:
  head/sys/kern/kern_linker.c

Modified: head/sys/kern/kern_linker.c
==============================================================================
--- head/sys/kern/kern_linker.c	Sun Jul 31 13:35:25 2011	(r224545)
+++ head/sys/kern/kern_linker.c	Sun Jul 31 13:49:15 2011	(r224546)
@@ -1116,8 +1116,9 @@ kern_kldunload(struct thread *td, int fi
 		PMC_CALL_HOOK(td, PMC_FN_KLD_UNLOAD, (void *) &pkm);
 		KLD_UNLOCK_READ();
 	} else
-#else
 		KLD_UNLOCK();
+#else
+	KLD_UNLOCK();
 #endif
 	CURVNET_RESTORE();
 	return (error);