From 29c8aa6494013f4f7b580ef43d85424d90d843bb Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Fri, 30 Mar 2012 11:00:37 +0200 Subject: 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. --- cpukit/libblock/src/flashdisk.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'cpukit') diff --git a/cpukit/libblock/src/flashdisk.c b/cpukit/libblock/src/flashdisk.c index 4a664ffa34..ff336925c6 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)--; } -- cgit v1.2.3