From 2d1994c949088978de5a6d064afaf2bdb4168e2d Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 24 Jun 2010 19:57:58 +0000 Subject: 2010-06-24 Bharath Suri PR 1542/filesystem PR 1585/filesystem * libfs/src/pipe/fifo.c: pipe_control_t was not deallocated if fifo_open() was attempted with (O_WRONLY|O_NONBLOCK). Mutex was locked too many times on this path and we needed an unlock. --- cpukit/libfs/src/pipe/fifo.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'cpukit/libfs/src/pipe/fifo.c') diff --git a/cpukit/libfs/src/pipe/fifo.c b/cpukit/libfs/src/pipe/fifo.c index d306c00395..38b90ed36e 100644 --- a/cpukit/libfs/src/pipe/fifo.c +++ b/cpukit/libfs/src/pipe/fifo.c @@ -104,6 +104,8 @@ static int pipe_alloc( if (! pipe->Buffer) goto err_buf; + err = -ENOMEM; + if (rtems_barrier_create( rtems_build_name ('P', 'I', 'r', c), RTEMS_BARRIER_MANUAL_RELEASE, 0, @@ -342,15 +344,17 @@ int fifo_open( break; case LIBIO_FLAGS_WRITE: + pipe->writerCounter ++; + + if (pipe->Writers ++ == 0) + PIPE_WAKEUPREADERS(pipe); + if (pipe->Readers == 0 && LIBIO_NODELAY(iop)) { + PIPE_UNLOCK(pipe); err = -ENXIO; goto out_error; } - pipe->writerCounter ++; - if (pipe->Writers ++ == 0) - PIPE_WAKEUPREADERS(pipe); - if (pipe->Readers == 0) { prevCounter = pipe->readerCounter; err = -EINTR; -- cgit v1.2.3