diff options
author | alc <alc@FreeBSD.org> | 2003-07-29 05:23:19 +0000 |
---|---|---|
committer | alc <alc@FreeBSD.org> | 2003-07-29 05:23:19 +0000 |
commit | bbf702f5b5e1d9fcbca53b2c1676dea5d448a26e (patch) | |
tree | 1ba5d924caa14a5f093b8d2f157c51da1d57cdcd | |
parent | 6c5f68638fb23d2cb0db92368a00ee2cac2a9d88 (diff) | |
download | FreeBSD-src-bbf702f5b5e1d9fcbca53b2c1676dea5d448a26e.zip FreeBSD-src-bbf702f5b5e1d9fcbca53b2c1676dea5d448a26e.tar.gz |
Revision 1.51 of vm/uma_core.c modified uma_large_free() to acquire Giant
when needed. So, don't do it here.
-rw-r--r-- | sys/kern/kern_descrip.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index c832ef2..be1a30f 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -1100,11 +1100,8 @@ fdalloc(td, want, result) */ FILEDESC_LOCK(fdp); if (fdp->fd_nfiles >= nfiles) { - /* XXX uma_large_free() needs Giant. */ FILEDESC_UNLOCK(fdp); - mtx_lock(&Giant); free(newofile, M_FILEDESC); - mtx_unlock(&Giant); FILEDESC_LOCK(fdp); continue; } @@ -1129,11 +1126,8 @@ fdalloc(td, want, result) fdp->fd_nfiles = nfiles; fdexpand++; if (oldofile != NULL) { - /* XXX uma_large_free() needs Giant. */ FILEDESC_UNLOCK(fdp); - mtx_lock(&Giant); free(oldofile, M_FILEDESC); - mtx_unlock(&Giant); FILEDESC_LOCK(fdp); } } |