diff options
| author | Chris Johns <chrisj@rtems.org> | 2009-04-28 11:17:36 +0000 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2009-04-28 11:17:36 +0000 |
| commit | 8c44190a9189f7b750fc58ae07e98fe84f569f40 (patch) | |
| tree | 18ae12b815789d91af30cd5552a4b3f84d3d2dd6 /cpukit | |
| parent | 2009-04-28 Chris Johns <chrisj@rtems.org> (diff) | |
| download | rtems-8c44190a9189f7b750fc58ae07e98fe84f569f40.tar.bz2 | |
2009-04-28 Chris Johns <chrisj@rtems.org>
* libblock/src/bdbuf.c: Flush the transfer sync event before
blocking in a read.
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/ChangeLog | 5 | ||||
| -rw-r--r-- | cpukit/libblock/src/bdbuf.c | 16 |
2 files changed, 17 insertions, 4 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 0eccbe93ea..b2688d7a42 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,5 +1,10 @@ 2009-04-28 Chris Johns <chrisj@rtems.org> + * libblock/src/bdbuf.c: Flush the transfer sync event before + blocking in a read. + +2009-04-28 Chris Johns <chrisj@rtems.org> + * libnetworking/nfs/bootp_subr.c: Fixed PR1384. The route set in the initialise pass is not deleted so an exists error is returned. Ignore the error. Print the server address as an IP diff --git a/cpukit/libblock/src/bdbuf.c b/cpukit/libblock/src/bdbuf.c index 48751b34f9..3d57a3c3b8 100644 --- a/cpukit/libblock/src/bdbuf.c +++ b/cpukit/libblock/src/bdbuf.c @@ -1639,9 +1639,17 @@ rtems_bdbuf_read (dev_t device, * enabled and the pool unlocked. This is a change to the previous version * of the bdbuf code. */ - int result; - uint32_t b; - + rtems_event_set out; + int result; + uint32_t b; + + /* + * Flush any events. + */ + rtems_event_receive (RTEMS_BDBUF_TRANSFER_SYNC, + RTEMS_EVENT_ALL | RTEMS_NO_WAIT, + 0, &out); + rtems_bdbuf_unlock_pool (pool); req->req = RTEMS_BLKDEV_REQ_READ; @@ -1665,7 +1673,7 @@ rtems_bdbuf_read (dev_t device, else { rtems_status_code sc; - rtems_event_set out; + sc = rtems_event_receive (RTEMS_BDBUF_TRANSFER_SYNC, RTEMS_EVENT_ALL | RTEMS_WAIT, 0, &out); |