From owner-svn-src-all@FreeBSD.ORG  Mon Jun 11 17:42:40 2012
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 6F9D61065670;
	Mon, 11 Jun 2012 17:42:40 +0000 (UTC) (envelope-from mjg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5AB588FC1B;
	Mon, 11 Jun 2012 17:42:40 +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 q5BHgerS000403;
	Mon, 11 Jun 2012 17:42:40 GMT (envelope-from mjg@svn.freebsd.org)
Received: (from mjg@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5BHgedW000401;
	Mon, 11 Jun 2012 17:42:40 GMT (envelope-from mjg@svn.freebsd.org)
Message-Id: <201206111742.q5BHgedW000401@svn.freebsd.org>
From: Mateusz Guzik <mjg@FreeBSD.org>
Date: Mon, 11 Jun 2012 17:42:40 +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: r236899 - head/sys/libkern
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: Mon, 11 Jun 2012 17:42:40 -0000

Author: mjg
Date: Mon Jun 11 17:42:39 2012
New Revision: 236899
URL: http://svn.freebsd.org/changeset/base/236899

Log:
  Fix unloading of libiconv module.
  
  Previously it would either loop infinitely or exit with error leaking a lock.
  
  Reported by:	Will DeVries
  Approved by:	trasz (mentor)
  MFC after:	1 week

Modified:
  head/sys/libkern/iconv.c

Modified: head/sys/libkern/iconv.c
==============================================================================
--- head/sys/libkern/iconv.c	Mon Jun 11 17:27:53 2012	(r236898)
+++ head/sys/libkern/iconv.c	Mon Jun 11 17:42:39 2012	(r236899)
@@ -84,9 +84,11 @@ iconv_mod_unload(void)
 	struct iconv_cspair *csp;
 
 	sx_xlock(&iconv_lock);
-	while ((csp = TAILQ_FIRST(&iconv_cslist)) != NULL) {
-		if (csp->cp_refcount)
+	TAILQ_FOREACH(csp, &iconv_cslist, cp_link) {
+		if (csp->cp_refcount) {
+			sx_xunlock(&iconv_lock);
 			return EBUSY;
+		}
 	}
 
 	while ((csp = TAILQ_FIRST(&iconv_cslist)) != NULL)