 @@ -1,14 +1,14 @@
-/*	$NetBSD: sys_aio.c,v 1.19.8.2 2010/01/30 20:46:20 snj Exp $	*/
+/*	$NetBSD: sys_aio.c,v 1.19.8.3 2010/01/30 21:19:19 snj Exp $	*/
 /*
  * Copyright (c) 2007, Mindaugas Rasiukevicius <rmind at NetBSD org>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -22,27 +22,27 @@
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /*
  * Implementation of POSIX asynchronous I/O.
  * Defined in the Base Definitions volume of IEEE Std 1003.1-2001.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_aio.c,v 1.19.8.2 2010/01/30 20:46:20 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_aio.c,v 1.19.8.3 2010/01/30 21:19:19 snj Exp $");
 #include "opt_ddb.h"
 #include <sys/param.h>
 #include <sys/condvar.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/lwp.h>
 #include <sys/mutex.h>
 #include <sys/pool.h>
 #include <sys/proc.h>
 @@ -751,31 +751,31 @@ sys_aio_suspend(struct lwp *l, const str
 		error = copyin(SCARG(uap, timeout), &ts,
 		    sizeof(struct timespec));
 		if (error)
 			return error;
 		timo = mstohz((ts.tv_sec * 1000) + (ts.tv_nsec / 1000000));
 		if (timo == 0 && ts.tv_sec == 0 && ts.tv_nsec > 0)
 			timo = 1;
 		if (timo <= 0)
 			return EAGAIN;
 	} else
 		timo = 0;
 	/* Get the list from user-space */
-	aiocbp_list = kmem_zalloc(nent * sizeof(struct aio_job), KM_SLEEP);
+	aiocbp_list = kmem_alloc(nent * sizeof(*aiocbp_list), KM_SLEEP);
 	error = copyin(SCARG(uap, list), aiocbp_list,
-	    nent * sizeof(struct aiocb));
+	    nent * sizeof(*aiocbp_list));
 	if (error) {
-		kmem_free(aiocbp_list, nent * sizeof(struct aio_job));
+		kmem_free(aiocbp_list, nent * sizeof(*aiocbp_list));
 		return error;
+	}
 	mutex_enter(&aio->aio_mtx);
 	for (;;) {
 		for (i = 0; i < nent; i++) {
 			/* Skip NULL entries */
 			if (aiocbp_list[i] == NULL)
 				continue;
 			/* Skip current job */
 @@ -793,42 +793,42 @@ sys_aio_suspend(struct lwp *l, const str
 			if (a_job == NULL) {
 				struct aiocb aiocbp;
 				mutex_exit(&aio->aio_mtx);
 				error = copyin(aiocbp_list[i], &aiocbp,
 				    sizeof(struct aiocb));
 				if (error == 0 && aiocbp._state != JOB_DONE) {
 					mutex_enter(&aio->aio_mtx);
 					continue;
+				}
 				kmem_free(aiocbp_list,
-				    nent * sizeof(struct aio_job));
+				    nent * sizeof(*aiocbp_list));
 				return error;
+			}
+		}
 		/* Wait for a signal or when timeout occurs */
 		error = cv_timedwait_sig(&aio->done_cv, &aio->aio_mtx, timo);
 		if (error) {
 			if (error == EWOULDBLOCK)
 				error = EAGAIN;
 			break;
+		}
+	}
 	mutex_exit(&aio->aio_mtx);
-	kmem_free(aiocbp_list, nent * sizeof(struct aio_job));
+	kmem_free(aiocbp_list, nent * sizeof(*aiocbp_list));
 	return error;
+}
 int
 sys_aio_write(struct lwp *l, const struct sys_aio_write_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(struct aiocb *) aiocbp;
 	} */
 	return aio_enqueue_job(AIO_WRITE, SCARG(uap, aiocbp), NULL);
+}
 @@ -888,29 +888,29 @@ sys_lio_listio(struct lwp *l, const stru
 			memset(&lio->sig, 0, sizeof(struct sigevent));
 		break;
 	default:
 		error = EINVAL;
 		break;
+	}
 	if (error != 0) {
 		pool_put(&aio_lio_pool, lio);
 		return error;
+	}
 	/* Get the list from user-space */
-	aiocbp_list = kmem_zalloc(nent * sizeof(struct aio_job), KM_SLEEP);
+	aiocbp_list = kmem_alloc(nent * sizeof(*aiocbp_list), KM_SLEEP);
 	error = copyin(SCARG(uap, list), aiocbp_list,
-	    nent * sizeof(struct aiocb));
+	    nent * sizeof(*aiocbp_list));
 	if (error) {
 		mutex_enter(&aio->aio_mtx);
 		goto err;
+	}
 	/* Enqueue all jobs */
 	errcnt = 0;
 	for (i = 0; i < nent; i++) {
 		error = aio_enqueue_job(AIO_LIO, aiocbp_list[i], lio);
 		/*
 		 * According to POSIX, in such error case it may
 		 * fail with other I/O operations initiated.
 		 */
 @@ -935,27 +935,27 @@ sys_lio_listio(struct lwp *l, const stru
 			error = cv_wait_sig(&aio->done_cv, &aio->aio_mtx);
 		if (error)
 			error = EINTR;
+	}
 err:
 	if (--lio->refcnt != 0)
 		lio = NULL;
 	mutex_exit(&aio->aio_mtx);
 	if (lio != NULL) {
 		aio_sendsig(p, &lio->sig);
 		pool_put(&aio_lio_pool, lio);
+	}
-	kmem_free(aiocbp_list, nent * sizeof(struct aio_job));
+	kmem_free(aiocbp_list, nent * sizeof(*aiocbp_list));
 	return error;
+}
 /*
  * SysCtl
  */
 static int
 sysctl_aio_listio_max(SYSCTLFN_ARGS)
+{
 	struct sysctlnode node;
 	int error, newsize;