summaryrefslogtreecommitdiffstats
path: root/cpukit/posix/src/aio_misc.c
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2011-01-08 21:01:32 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2011-01-08 21:01:32 +0000
commit6c48b5358c5815bba9f80493a6581229dc131b9b (patch)
treee69f0b0fb10e51e391b878a9c99f1b82f4ca006c /cpukit/posix/src/aio_misc.c
parentUpdate. (diff)
downloadrtems-6c48b5358c5815bba9f80493a6581229dc131b9b.tar.bz2
2011-01-08 Alin Rus <alin.codejunkie@gmail.com>
* posix/src/aio_misc.c: Fix rtems_aio_remove_req did not iterate over chain. * posix/src/aio_cancel.c: Add debug information. Add check for bad file descriptor. Add else branch for cancel request on empty IQ chain.
Diffstat (limited to 'cpukit/posix/src/aio_misc.c')
-rw-r--r--cpukit/posix/src/aio_misc.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/cpukit/posix/src/aio_misc.c b/cpukit/posix/src/aio_misc.c
index b9d12244cb..038765e9a5 100644
--- a/cpukit/posix/src/aio_misc.c
+++ b/cpukit/posix/src/aio_misc.c
@@ -179,7 +179,6 @@ void rtems_aio_remove_fd (rtems_aio_request_chain *r_chain)
{
rtems_chain_control *chain;
rtems_chain_node *node;
-
chain = &r_chain->perfd;
node = rtems_chain_first (chain);
@@ -187,6 +186,7 @@ void rtems_aio_remove_fd (rtems_aio_request_chain *r_chain)
{
rtems_chain_extract (node);
rtems_aio_request *req = (rtems_aio_request *) node;
+ node = rtems_chain_next (node);
req->aiocbp->error_code = ECANCELED;
req->aiocbp->return_value = -1;
free (req);
@@ -211,6 +211,9 @@ void rtems_aio_remove_fd (rtems_aio_request_chain *r_chain)
int rtems_aio_remove_req (rtems_chain_control *chain, struct aiocb *aiocbp)
{
+ if (rtems_chain_is_empty (chain))
+ return AIO_ALLDONE;
+
rtems_chain_node *node = rtems_chain_first (chain);
rtems_aio_request *current;