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.
This commit is contained in:
Sebastian Huber
2012-03-30 11:00:37 +02:00
parent 4abb14e5ca
commit 29c8aa6494

View File

@@ -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)--;
}