--- libaitsched/src/hooks.c	2012/08/01 14:11:43	1.10.2.2
+++ libaitsched/src/hooks.c	2012/08/01 16:47:06	1.10.2.6
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: hooks.c,v 1.10.2.2 2012/08/01 14:11:43 misho Exp $
+* $Id: hooks.c,v 1.10.2.6 2012/08/01 16:47:06 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -107,6 +107,9 @@ sched_hook_cancel(void *task, void *arg __unused)
 	sched_task_t *t = task;
 	struct kevent chg[1];
 	struct timespec timeout = { 0, 0 };
+#ifdef EVFILT_AIO
+	struct aiocb *acb;
+#endif
 
 	if (!t || !TASK_ROOT(t))
 		return (void*) -1;
@@ -163,8 +166,11 @@ sched_hook_cancel(void *task, void *arg __unused)
 #else
 			EV_SET(&chg[0], TASK_VAL(t), EVFILT_AIO, EV_DELETE, 0, 0, (void*) TASK_VAL(t));
 #endif
-			if (TASK_VAL(t)) {
-				free((void*) TASK_VAL(t));
+			acb = (struct aiocb*) TASK_VAL(t);
+			if (acb) {
+				if (aio_cancel(acb->aio_fildes, acb) == AIO_CANCELED)
+					aio_return(acb);
+				free(acb);
 				TASK_VAL(t) = 0;
 			}
 			break;
@@ -449,6 +455,7 @@ sched_hook_fetch(void *root, void *arg __unused)
 	register int i, flg;
 	int en;
 #ifdef EVFILT_AIO
+	int len, fd;
 	struct aiocb *acb;
 #endif
 
@@ -771,10 +778,9 @@ sched_hook_fetch(void *root, void *arg __unused)
 #ifdef EVFILT_AIO
 			case EVFILT_AIO:
 				flg = 0;
-				acb = (struct aiocb*) TASK_VAL(task);
 				TAILQ_FOREACH_SAFE(task, &r->root_aio, task_node, tmp) {
-					if (acb != ((struct aiocb*) res[i].ident) || 
-							acb->aio_sigevent.sigev_value.sival_ptr != res[i].udata)
+					acb = (struct aiocb*) TASK_VAL(task);
+					if (acb != ((struct aiocb*) res[i].udata))
 						continue;
 					else
 						flg++;
@@ -794,6 +800,16 @@ sched_hook_fetch(void *root, void *arg __unused)
 #ifdef HAVE_LIBPTHREAD
 					pthread_mutex_unlock(&r->root_mtx[taskREADY]);
 #endif
+					fd = acb->aio_fildes;
+					if ((len = aio_return(acb)) != -1) {
+						if (lseek(fd, acb->aio_offset + len, SEEK_CUR) == -1)
+							LOGERR;
+					} else
+						LOGERR;
+
+					free(acb);
+					TASK_FD(task) = fd;
+					TASK_DATLEN(task) = (u_long) len;
 				}
 				/* if match at least 2, don't remove resouce of event */
 				if (flg > 1)