--- libaitsched/src/hooks.c	2012/08/21 11:07:16	1.13.2.1
+++ libaitsched/src/hooks.c	2012/08/21 11:45:35	1.13.2.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: hooks.c,v 1.13.2.1 2012/08/21 11:07:16 misho Exp $
+* $Id: hooks.c,v 1.13.2.2 2012/08/21 11:45:35 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -596,8 +596,11 @@ sched_hook_fetch(void *root, void *arg __unused)
 				TAILQ_FOREACH_SAFE(task, &r->root_read, task_node, tmp) {
 					if (TASK_FD(task) != ((intptr_t) res[i].udata))
 						continue;
-					else
+					else {
 						flg++;
+						TASK_RET(task) = res[i].data;
+						TASK_FLAG(task) = res[i].fflags;
+					}
 					/* remove read handle */
 #ifdef HAVE_LIBPTHREAD
 					pthread_mutex_lock(&r->root_mtx[taskREAD]);
@@ -646,8 +649,11 @@ sched_hook_fetch(void *root, void *arg __unused)
 				TAILQ_FOREACH_SAFE(task, &r->root_write, task_node, tmp) {
 					if (TASK_FD(task) != ((intptr_t) res[i].udata))
 						continue;
-					else
+					else {
 						flg++;
+						TASK_RET(task) = res[i].data;
+						TASK_FLAG(task) = res[i].fflags;
+					}
 					/* remove write handle */
 #ifdef HAVE_LIBPTHREAD
 					pthread_mutex_lock(&r->root_mtx[taskWRITE]);
@@ -696,8 +702,11 @@ sched_hook_fetch(void *root, void *arg __unused)
 				TAILQ_FOREACH_SAFE(task, &r->root_alarm, task_node, tmp) {
 					if ((uintptr_t) TASK_DATA(task) != ((uintptr_t) res[i].udata))
 						continue;
-					else
+					else {
 						flg++;
+						TASK_RET(task) = res[i].data;
+						TASK_FLAG(task) = res[i].fflags;
+					}
 					/* remove alarm handle */
 #ifdef HAVE_LIBPTHREAD
 					pthread_mutex_lock(&r->root_mtx[taskALARM]);
@@ -726,8 +735,8 @@ sched_hook_fetch(void *root, void *arg __unused)
 						continue;
 					else {
 						flg++;
-						TASK_DATA(task) = (void*) (uintptr_t) res[i].data;
-						TASK_DATLEN(task) = res[i].fflags;
+						TASK_RET(task) = res[i].data;
+						TASK_FLAG(task) = res[i].fflags;
 					}
 					/* remove node handle */
 #ifdef HAVE_LIBPTHREAD
@@ -757,8 +766,8 @@ sched_hook_fetch(void *root, void *arg __unused)
 						continue;
 					else {
 						flg++;
-						TASK_DATA(task) = (void*) (uintptr_t) res[i].data;
-						TASK_DATLEN(task) = res[i].fflags;
+						TASK_RET(task) = res[i].data;
+						TASK_FLAG(task) = res[i].fflags;
 					}
 					/* remove proc handle */
 #ifdef HAVE_LIBPTHREAD
@@ -786,8 +795,11 @@ sched_hook_fetch(void *root, void *arg __unused)
 				TAILQ_FOREACH_SAFE(task, &r->root_signal, task_node, tmp) {
 					if (TASK_VAL(task) != ((uintptr_t) res[i].udata))
 						continue;
-					else
+					else {
 						flg++;
+						TASK_RET(task) = res[i].data;
+						TASK_FLAG(task) = res[i].fflags;
+					}
 					/* remove signal handle */
 #ifdef HAVE_LIBPTHREAD
 					pthread_mutex_lock(&r->root_mtx[taskSIGNAL]);
@@ -816,8 +828,11 @@ sched_hook_fetch(void *root, void *arg __unused)
 					acb = (struct aiocb*) TASK_VAL(task);
 					if (acb != ((struct aiocb*) res[i].udata))
 						continue;
-					else
+					else {
 						flg++;
+						TASK_RET(task) = res[i].data;
+						TASK_FLAG(task) = res[i].fflags;
+					}
 					/* remove user handle */
 #ifdef HAVE_LIBPTHREAD
 					pthread_mutex_lock(&r->root_mtx[taskAIO]);
@@ -855,8 +870,11 @@ sched_hook_fetch(void *root, void *arg __unused)
 					acbs = (struct aiocb**) TASK_VAL(task);
 					if (acbs != ((struct aiocb**) res[i].udata))
 						continue;
-					else
+					else {
 						flg++;
+						TASK_RET(task) = res[i].data;
+						TASK_FLAG(task) = res[i].fflags;
+					}
 					/* remove user handle */
 #ifdef HAVE_LIBPTHREAD
 					pthread_mutex_lock(&r->root_mtx[taskLIO]);
@@ -904,8 +922,8 @@ sched_hook_fetch(void *root, void *arg __unused)
 						continue;
 					else {
 						flg++;
-						TASK_DATA(task) = (void*) res[i].data;
-						TASK_DATLEN(task) = res[i].fflags;
+						TASK_RET(task) = res[i].data;
+						TASK_FLAG(task) = res[i].fflags;
 					}
 					/* remove user handle */
 #ifdef HAVE_LIBPTHREAD