d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix unloading of libiconv module.

Browse Source 
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
This commit is contained in:
Mateusz Guzik 2012-06-11 17:42:39 +00:00
parent 7aa2051e40
commit 414d9b2ed0
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/libkern/iconv.c
View File

@ -84,9 +84,11 @@ iconv_mod_unload(void)
struct iconv_cspair *csp; struct iconv_cspair *csp;
sx_xlock(&iconv_lock); sx_xlock(&iconv_lock);
while ((csp = TAILQ_FIRST(&iconv_cslist)) != NULL) { TAILQ_FOREACH(csp, &iconv_cslist, cp_link) {
if (csp->cp_refcount) if (csp->cp_refcount) {
sx_xunlock(&iconv_lock);
return EBUSY; return EBUSY;
}
} }
while ((csp = TAILQ_FIRST(&iconv_cslist)) != NULL) while ((csp = TAILQ_FIRST(&iconv_cslist)) != NULL)