From db43cd0417199b649cf5492ebcd048f43074385b Mon Sep 17 00:00:00 2001
From: Doug Ambrisko <ambrisko@FreeBSD.org>
Date: Wed, 12 Oct 2005 22:33:22 +0000
Subject: [PATCH] Fix tinderbox box by removing incomplete/bad spl usage. 
 Proper giant free locking is required in for aio.

Pointed out by:	imp
---
 sys/kern/vfs_aio.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c
index b8b798b8821a..2d550da7d0c6 100644
--- a/sys/kern/vfs_aio.c
+++ b/sys/kern/vfs_aio.c
@@ -1987,7 +1987,6 @@ lio_listio(struct thread *td, struct lio_listio_args *uap)
 	int error, runningcode;
 	int nerror;
 	int i;
-	int s;
 
 	if ((uap->mode != LIO_NOWAIT) && (uap->mode != LIO_WAIT))
 		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->f_type != DTYPE_KQUEUE)) {
 				uma_zfree(aiolio_zone, lj);
-				splx(s);
 				return (EBADF);
 			}
 			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);
 			if (error) {
 				uma_zfree(aiolio_zone, lj);
-				splx(s);
 				return (error);
 			}
 		} else 	if (!_SIG_VALID(lj->lioj_signal.sigev_signo)) {
 			uma_zfree(aiolio_zone, lj);
-			splx(s);
 			return EINVAL;
 		} else {
 			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) {
 					if (((intptr_t)cb->uaiocb._aiocb_private.kernelinfo)
 					    == jobref) {
@@ -2153,7 +2148,6 @@ lio_listio(struct thread *td, struct lio_listio_args *uap)
 						break;
 					}
 				}
-				splx(s);
 			}
 
 			/*