summaryrefslogtreecommitdiffstats
path: root/cpukit/posix
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2010-08-24 12:04:43 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2010-08-24 12:04:43 +0000
commit89dbb28bd4c1f4240a84efedab75eebe083647b8 (patch)
tree6374a7075186c731f1366461cd971458d2915887 /cpukit/posix
parent2010-09-24 Ralf Corsépius <ralf.corsepius@rtems.org> (diff)
downloadrtems-89dbb28bd4c1f4240a84efedab75eebe083647b8.tar.bz2
2010-09-24 Ralf Corsépius <ralf.corsepius@rtems.org>
* posix/src/aio_cancel.c: Spray pthread_mutex_unlocks.
Diffstat (limited to 'cpukit/posix')
-rw-r--r--cpukit/posix/src/aio_cancel.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/cpukit/posix/src/aio_cancel.c b/cpukit/posix/src/aio_cancel.c
index d9a982cf31..7006f793c7 100644
--- a/cpukit/posix/src/aio_cancel.c
+++ b/cpukit/posix/src/aio_cancel.c
@@ -45,9 +45,11 @@ int aio_cancel(int fildes, struct aiocb *aiocbp)
if (aiocbp == NULL)
{
- if (fcntl (fildes, F_GETFL) < 0)
+ if (fcntl (fildes, F_GETFL) < 0) {
+ pthread_mutex_unlock(&aio_request_queue.mutex);
rtems_set_errno_and_return_minus_one (EBADF);
-
+ }
+
r_chain = rtems_aio_search_fd (&aio_request_queue.work_req,
fildes,
0);
@@ -58,8 +60,10 @@ int aio_cancel(int fildes, struct aiocb *aiocbp)
r_chain = rtems_aio_search_fd (&aio_request_queue.idle_req,
fildes,
0);
- if (r_chain == NULL)
+ if (r_chain == NULL) {
+ pthread_mutex_unlock(&aio_request_queue.mutex);
return AIO_ALLDONE;
+ }
rtems_chain_extract (&r_chain->next_fd);
rtems_aio_remove_fd (r_chain);
@@ -84,8 +88,7 @@ int aio_cancel(int fildes, struct aiocb *aiocbp)
}
else
{
- if (aiocbp->aio_fildes != fildes)
- {
+ if (aiocbp->aio_fildes != fildes) {
pthread_mutex_unlock (&aio_request_queue.mutex);
rtems_set_errno_and_return_minus_one (EINVAL);
}
@@ -120,5 +123,4 @@ int aio_cancel(int fildes, struct aiocb *aiocbp)
}
return AIO_ALLDONE;
-
}