diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2012-07-03 10:25:42 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2012-07-03 10:25:42 +0200 |
| commit | 90bd18efe75be10c4d17be7a64f6f54686e7db2c (patch) | |
| tree | daf9bb6db7ce34c7eae0c22ac4ecd69ef8cc7475 | |
| parent | Merge branch 'upstream' (diff) | |
| parent | libblock: Move read-ahead trigger check (diff) | |
| download | rtems-90bd18efe75be10c4d17be7a64f6f54686e7db2c.tar.bz2 | |
Merge branch 'upstream'
| -rw-r--r-- | cpukit/libblock/src/bdbuf.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cpukit/libblock/src/bdbuf.c b/cpukit/libblock/src/bdbuf.c index 34150600bc..5b66656499 100644 --- a/cpukit/libblock/src/bdbuf.c +++ b/cpukit/libblock/src/bdbuf.c @@ -2083,7 +2083,6 @@ rtems_bdbuf_read (rtems_disk_device *dd, printf ("bdbuf:read: %" PRIu32 " (%" PRIu32 ") (dev = %08x)\n", media_block + dd->start, block, (unsigned) dd->dev); - rtems_bdbuf_check_read_ahead_trigger (dd, block); bd = rtems_bdbuf_get_buffer_for_access (dd, media_block); switch (bd->state) { @@ -2114,6 +2113,8 @@ rtems_bdbuf_read (rtems_disk_device *dd, rtems_bdbuf_fatal (bd->state, RTEMS_BLKDEV_FATAL_BDBUF_STATE_4); break; } + + rtems_bdbuf_check_read_ahead_trigger (dd, block); } rtems_bdbuf_unlock_cache (); |