diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2012-03-30 11:00:37 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2012-04-16 11:06:45 +0200 |
| commit | 08b9d534604fbf437743a9925ef28eb1b848510d (patch) | |
| tree | 85844bf2a1d445093f3a2a5bb83999ab43ac5ec4 /cpukit | |
| parent | libblock: PR2040: Add starvation threshold (diff) | |
| download | rtems-08b9d534604fbf437743a9925ef28eb1b848510d.tar.bz2 | |
libblock: PR2040: Fix recycle destination update
Check the availablity of a recycle destination segment only when it is
necessary to avoid missing resycle source segment erasures.
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/libblock/src/flashdisk.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/cpukit/libblock/src/flashdisk.c b/cpukit/libblock/src/flashdisk.c index 418c6639b1..b778ab5a19 100644 --- a/cpukit/libblock/src/flashdisk.c +++ b/cpukit/libblock/src/flashdisk.c @@ -1261,12 +1261,18 @@ rtems_fdisk_recycle_segment (rtems_flashdisk* fd, for (spage = 0; spage < ssc->pages; spage++) { - uint32_t dst_pages; rtems_fdisk_page_desc* spd = &ssc->page_descriptors[spage]; + if (!dsc && ssc->pages_active > 0) + { + rtems_fdisk_error ("recycle: no available dst segment"); + return EIO; + } + if (rtems_fdisk_page_desc_flags_set (spd, RTEMS_FDISK_PAGE_ACTIVE) && !rtems_fdisk_page_desc_flags_set (spd, RTEMS_FDISK_PAGE_USED)) { + uint32_t dst_pages; rtems_fdisk_page_desc* dpd; uint32_t dpage; @@ -1352,14 +1358,7 @@ rtems_fdisk_recycle_segment (rtems_flashdisk* fd, */ dst_pages = rtems_fdisk_seg_pages_available (dsc); if (dst_pages == 0) - { dsc = rtems_fdisk_seg_most_available (&fd->available); - if (!dsc) - { - rtems_fdisk_error ("recycle: no available dst segment"); - return EIO; - } - } (*pages)--; } |