Date: Tue, 8 Jan 2013 04:43:20 +0000 (UTC) From: Kevin Lo <kevlo@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r245149 - stable/9/sys/libkern Message-ID: <201301080443.r084hKsp017952@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevlo Date: Tue Jan 8 04:43:20 2013 New Revision: 245149 URL: http://svnweb.freebsd.org/changeset/base/245149 Log: MFC r236899: Fix unloading of libiconv module. Previously it would either loop infinitely or exit with error leaking a lock. Modified: stable/9/sys/libkern/iconv.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/libkern/iconv.c ============================================================================== --- stable/9/sys/libkern/iconv.c Tue Jan 8 03:27:37 2013 (r245148) +++ stable/9/sys/libkern/iconv.c Tue Jan 8 04:43:20 2013 (r245149) @@ -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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301080443.r084hKsp017952>