Module Name: src
Committed By: snj
Date: Sat Jan 30 20:46:20 UTC 2010
Modified Files:
src/doc [netbsd-5]: CHANGES-5.1
src/sys/kern [netbsd-5]: sys_aio.c
Log Message:
Revert ticket 1286.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.190 -r1.1.2.191 src/doc/CHANGES-5.1
cvs rdiff -u -r1.19.8.1 -r1.19.8.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.1
diff -u src/doc/CHANGES-5.1:1.1.2.190 src/doc/CHANGES-5.1:1.1.2.191
--- src/doc/CHANGES-5.1:1.1.2.190 Sat Jan 30 20:26:50 2010
+++ src/doc/CHANGES-5.1 Sat Jan 30 20:46:20 2010
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1,v 1.1.2.190 2010/01/30 20:26:50 snj Exp $
+# $NetBSD: CHANGES-5.1,v 1.1.2.191 2010/01/30 20:46:20 snj Exp $
A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1
release:
@@ -16537,11 +16537,6 @@
Fix typo: CIOCASSYMFEAT -> CIOCASYMFEAT
[hubertf, ticket #1285]
-sys/kern/sys_aio.c 1.25
-
- aio_suspend1: fix a double free bug.
- [rmind, ticket #1286]
-
dist/file/doc/file.1 patch
dist/file/doc/libmagic.3 patch
Index: src/sys/kern/sys_aio.c
diff -u src/sys/kern/sys_aio.c:1.19.8.1 src/sys/kern/sys_aio.c:1.19.8.2
--- src/sys/kern/sys_aio.c:1.19.8.1 Sat Jan 30 19:53:21 2010
+++ src/sys/kern/sys_aio.c Sat Jan 30 20:46:20 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_aio.c,v 1.19.8.1 2010/01/30 19:53:21 snj Exp $ */
+/* $NetBSD: sys_aio.c,v 1.19.8.2 2010/01/30 20:46:20 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.8.1 2010/01/30 19:53:21 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_aio.c,v 1.19.8.2 2010/01/30 20:46:20 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;
}
}
