--- libaitsched/src/hooks.c	2012/08/02 12:58:02	1.10.2.10
+++ libaitsched/src/hooks.c	2012/08/02 13:45:02	1.10.2.11
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: hooks.c,v 1.10.2.10 2012/08/02 12:58:02 misho Exp $
+* $Id: hooks.c,v 1.10.2.11 2012/08/02 13:45:02 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -109,6 +109,10 @@ sched_hook_cancel(void *task, void *arg __unused)
 	struct timespec timeout = { 0, 0 };
 #ifdef AIO_SUPPORT
 	struct aiocb *acb;
+#ifdef EVFILT_LIO
+	struct aiocb **acbs;
+	register int i;
+#endif	/* EVFILT_LIO */
 #endif	/* AIO_SUPPORT */
 
 	if (!t || !TASK_ROOT(t))
@@ -174,6 +178,25 @@ sched_hook_cancel(void *task, void *arg __unused)
 				TASK_VAL(t) = 0;
 			}
 			break;
+#ifdef EVFILT_LIO
+		case taskLIO:
+#ifdef __NetBSD__
+			EV_SET(&chg[0], TASK_VAL(t), EVFILT_LIO, EV_DELETE, 0, 0, (intptr_t) TASK_VAL(t));
+#else
+			EV_SET(&chg[0], TASK_VAL(t), EVFILT_LIO, EV_DELETE, 0, 0, (void*) TASK_VAL(t));
+#endif
+			acbs = (struct aiocb**) TASK_VAL(t);
+			if (acbs) {
+				for (i = 0; i < TASK_DATLEN(t); i++) {
+					if (aio_cancel(acbs[i]->aio_fildes, acbs[i]) == AIO_CANCELED)
+						aio_return(acbs[i]);
+					free(acbs[i]);
+				}
+				free(acbs);
+				TASK_VAL(t) = 0;
+			}
+			break;
+#endif	/* EVFILT_LIO */
 #endif	/* AIO_SUPPORT */
 #ifdef EVFILT_USER
 		case taskUSER:
@@ -784,9 +807,6 @@ sched_hook_fetch(void *root, void *arg __unused)
 				break;
 #ifdef AIO_SUPPORT
 			case EVFILT_AIO:
-#ifdef EVFILT_LIO
-			case EVFILT_LIO:
-#endif	/* EVFILT_LIO */
 				flg = 0;
 				TAILQ_FOREACH_SAFE(task, &r->root_aio, task_node, tmp) {
 					acb = (struct aiocb*) TASK_VAL(task);
@@ -810,41 +830,67 @@ sched_hook_fetch(void *root, void *arg __unused)
 #ifdef HAVE_LIBPTHREAD
 					pthread_mutex_unlock(&r->root_mtx[taskREADY]);
 #endif
-#ifdef EVFILT_LIO
-					if (res[i].filter == EVFILT_LIO) {
-						acbs = (struct aiocb**) TASK_VAL(task);
-						iv = (struct iovec*) TASK_DATA(task);
-						fd = acbs[0]->aio_fildes;
-						off = acbs[0]->aio_offset;
-						for (j = len = 0; i < TASK_DATLEN(task); len += l, i++) {
-							if ((iv[i].iov_len = aio_return(acbs[i])) == -1)
-								l = 0;
-							else
-								l = iv[i].iov_len;
-							free(acbs[i]);
-						}
-						free(acbs);
-						if (lseek(fd, off + len, SEEK_CUR) == -1)
+					fd = acb->aio_fildes;
+					if ((len = aio_return(acb)) != -1) {
+						if (lseek(fd, acb->aio_offset + len, SEEK_CUR) == -1)
 							LOGERR;
 					} else
-#endif	/* EVFILT_LIO */
-					{
-						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);
+						LOGERR;
+					free(acb);
+					TASK_DATLEN(task) = (u_long) len;
+					TASK_FD(task) = fd;
+				}
+				/* if match at least 2, don't remove resouce of event */
+				if (flg > 1)
+					evt->flags ^= evt->flags;
+				break;
+#ifdef EVFILT_LIO
+			case EVFILT_LIO:
+				flg = 0;
+				TAILQ_FOREACH_SAFE(task, &r->root_lio, task_node, tmp) {
+					acbs = (struct aiocb**) TASK_VAL(task);
+					if (acbs != ((struct aiocb**) res[i].udata))
+						continue;
+					else
+						flg++;
+					/* remove user handle */
+#ifdef HAVE_LIBPTHREAD
+					pthread_mutex_lock(&r->root_mtx[taskLIO]);
+#endif
+					TAILQ_REMOVE(&r->root_lio, task, task_node);
+#ifdef HAVE_LIBPTHREAD
+					pthread_mutex_unlock(&r->root_mtx[taskLIO]);
+#endif
+					task->task_type = taskREADY;
+#ifdef HAVE_LIBPTHREAD
+					pthread_mutex_lock(&r->root_mtx[taskREADY]);
+#endif
+					TAILQ_INSERT_TAIL(&r->root_ready, task, task_node);
+#ifdef HAVE_LIBPTHREAD
+					pthread_mutex_unlock(&r->root_mtx[taskREADY]);
+#endif
+					iv = (struct iovec*) TASK_DATA(task);
+					fd = acbs[0]->aio_fildes;
+					off = acbs[0]->aio_offset;
+					for (j = len = 0; i < TASK_DATLEN(task); len += l, i++) {
+						if ((iv[i].iov_len = aio_return(acbs[i])) == -1)
+							l = 0;
+						else
+							l = iv[i].iov_len;
+						free(acbs[i]);
 					}
+					free(acbs);
 					TASK_DATLEN(task) = (u_long) len;
 					TASK_FD(task) = fd;
+
+					if (lseek(fd, off + len, SEEK_CUR) == -1)
+						LOGERR;
 				}
 				/* if match at least 2, don't remove resouce of event */
 				if (flg > 1)
 					evt->flags ^= evt->flags;
 				break;
+#endif	/* EVFILT_LIO */
 #endif	/* AIO_SUPPORT */
 #ifdef EVFILT_USER
 			case EVFILT_USER: