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

Fix tinderbox box by removing incomplete/bad spl usage. Proper giant free

Browse Source 
locking is required in for aio.

Pointed out by:	imp
This commit is contained in:
Doug Ambrisko 2005-10-12 22:33:22 +00:00
parent 384c6482df
commit db43cd0417
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/kern/vfs_aio.c
View File

@ -1987,7 +1987,6 @@ lio_listio(struct thread *td, struct lio_listio_args *uap)
int error, runningcode; int error, runningcode;
int nerror; int nerror;
int i; int i;
int s;
if ((uap->mode != LIO_NOWAIT) && (uap->mode != LIO_WAIT)) if ((uap->mode != LIO_NOWAIT) && (uap->mode != LIO_WAIT))
return (EINVAL); return (EINVAL);
@ -2040,7 +2039,6 @@ lio_listio(struct thread *td, struct lio_listio_args *uap)
(kq_fp = p->p_fd->fd_ofiles[kev.ident]) == NULL || (kq_fp = p->p_fd->fd_ofiles[kev.ident]) == NULL ||
(kq_fp->f_type != DTYPE_KQUEUE)) { (kq_fp->f_type != DTYPE_KQUEUE)) {
uma_zfree(aiolio_zone, lj); uma_zfree(aiolio_zone, lj);
splx(s);
return (EBADF); return (EBADF);
} }
kq = (struct kqueue *)kq_fp->f_data; kq = (struct kqueue *)kq_fp->f_data;
@ -2051,12 +2049,10 @@ lio_listio(struct thread *td, struct lio_listio_args *uap)
error = kqueue_register(kq, &kev, td, 1); error = kqueue_register(kq, &kev, td, 1);
if (error) { if (error) {
uma_zfree(aiolio_zone, lj); uma_zfree(aiolio_zone, lj);
splx(s);
return (error); return (error);
} }
} else if (!_SIG_VALID(lj->lioj_signal.sigev_signo)) { } else if (!_SIG_VALID(lj->lioj_signal.sigev_signo)) {
uma_zfree(aiolio_zone, lj); uma_zfree(aiolio_zone, lj);
splx(s);
return EINVAL; return EINVAL;
} else { } else {
lj->lioj_flags |= LIOJ_SIGNAL; lj->lioj_flags |= LIOJ_SIGNAL;
@ -2145,7 +2141,6 @@ lio_listio(struct thread *td, struct lio_listio_args *uap)
} }
} }
s = splbio();
TAILQ_FOREACH(cb, &ki->kaio_bufdone, plist) { TAILQ_FOREACH(cb, &ki->kaio_bufdone, plist) {
if (((intptr_t)cb->uaiocb._aiocb_private.kernelinfo) if (((intptr_t)cb->uaiocb._aiocb_private.kernelinfo)
== jobref) { == jobref) {
@ -2153,7 +2148,6 @@ lio_listio(struct thread *td, struct lio_listio_args *uap)
break; break;
} }
} }
splx(s);
} }
/* /*