From bbf702f5b5e1d9fcbca53b2c1676dea5d448a26e Mon Sep 17 00:00:00 2001 From: alc Date: Tue, 29 Jul 2003 05:23:19 +0000 Subject: Revision 1.51 of vm/uma_core.c modified uma_large_free() to acquire Giant when needed. So, don't do it here. --- sys/kern/kern_descrip.c | 6 ------ 1 file changed, 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); } } -- cgit v1.1