From owner-svn-src-stable-8@FreeBSD.ORG  Wed Mar 21 10:03:53 2012
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 624E11065674;
	Wed, 21 Mar 2012 10:03:53 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4D1D78FC15;
	Wed, 21 Mar 2012 10:03:53 +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 q2LA3rBR065930;
	Wed, 21 Mar 2012 10:03:53 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2LA3qsQ065928;
	Wed, 21 Mar 2012 10:03:52 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201203211003.q2LA3qsQ065928@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Wed, 21 Mar 2012 10:03:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r233277 - stable/8/sys/kern
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
	<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Mar 2012 10:03:53 -0000

Author: ae
Date: Wed Mar 21 10:03:52 2012
New Revision: 233277
URL: http://svn.freebsd.org/changeset/base/233277

Log:
  MFC r224546 (by glebius):
    Don't leak kld_sx lock in kldunloadf().

Modified:
  stable/8/sys/kern/kern_linker.c
Directory Properties:
  stable/8/sys/   (props changed)

Modified: stable/8/sys/kern/kern_linker.c
==============================================================================
--- stable/8/sys/kern/kern_linker.c	Wed Mar 21 09:48:32 2012	(r233276)
+++ stable/8/sys/kern/kern_linker.c	Wed Mar 21 10:03:52 2012	(r233277)
@@ -1111,8 +1111,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);