Module Name: src
Committed By: snj
Date: Sat Jan 30 20:44:51 UTC 2010
Modified Files:
src/doc [netbsd-5-0]: CHANGES-5.0.2
src/sys/kern [netbsd-5-0]: sys_aio.c
Log Message:
Revert ticket 1286.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.49 -r1.1.2.50 src/doc/CHANGES-5.0.2
cvs rdiff -u -r1.19.10.1 -r1.19.10.2 src/sys/kern/sys_aio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/CHANGES-5.0.2
diff -u src/doc/CHANGES-5.0.2:1.1.2.49 src/doc/CHANGES-5.0.2:1.1.2.50
--- src/doc/CHANGES-5.0.2:1.1.2.49 Sat Jan 30 20:39:46 2010
+++ src/doc/CHANGES-5.0.2 Sat Jan 30 20:44:51 2010
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.0.2,v 1.1.2.49 2010/01/30 20:39:46 snj Exp $
+# $NetBSD: CHANGES-5.0.2,v 1.1.2.50 2010/01/30 20:44:51 snj Exp $
A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2
release:
@@ -1145,11 +1145,6 @@
issues in vnd(4) and cgd(4).
[bouyer, ticket #1269]
-sys/kern/sys_aio.c 1.25
-
- aio_suspend1: fix a double free bug.
- [rmind, ticket #1286]
-
common/lib/libc/hash/sha2/sha2.c 1.20
Fix unaligned access as reported in PR port-sparc/42273.
Index: src/sys/kern/sys_aio.c
diff -u src/sys/kern/sys_aio.c:1.19.10.1 src/sys/kern/sys_aio.c:1.19.10.2
--- src/sys/kern/sys_aio.c:1.19.10.1 Sat Jan 30 20:05:56 2010
+++ src/sys/kern/sys_aio.c Sat Jan 30 20:44:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_aio.c,v 1.19.10.1 2010/01/30 20:05:56 snj Exp $ */
+/* $NetBSD: sys_aio.c,v 1.19.10.2 2010/01/30 20:44:51 snj Exp $ */
/*
* Copyright (c) 2007, Mindaugas Rasiukevicius <rmind at NetBSD org>
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_aio.c,v 1.19.10.1 2010/01/30 20:05:56 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_aio.c,v 1.19.10.2 2010/01/30 20:44:51 snj Exp $");
#include "opt_ddb.h"
@@ -801,6 +801,9 @@
mutex_enter(&aio->aio_mtx);
continue;
}
+
+ kmem_free(aiocbp_list,
+ nent * sizeof(struct aio_job));
return error;
}
}
