Ticket #1433: read_err.patch

Index: src/bdbuf.c
===================================================================
RCS file: /usr1/CVS/rtems/cpukit/libblock/src/bdbuf.c,v
retrieving revision 1.42
diff -r1.42 bdbuf.c
1472a1473
> start:
1679a1681,1691
>       case RTEMS_BDBUF_STATE_EMPTY:
>         /*
>          * Buffer transfer finished with an error and read procedure
>          * (for another task) put this buffer into ready list and removed it
>          * from AVL tree, so we need to start from the beginning - try to
>          * re-read the buffer.
>          */
>         assert(rtems_bdbuf_avl_search (&pool->tree, device, block) == NULL);
>         goto start;
>         break;
> 
1800a1813,1830
> /**
>  * An auxiliary function that is used to put a buffer in ready
>  * queue with EMPTY state.
>  *
>  * @param[in] bd    Pointer to a buffer that needs to be released.
>  *
>  * @return N/A
>  */
> static void
> rtems_bdbuf_release_empty(rtems_bdbuf_buffer *bd)
> {
>   bd->state = RTEMS_BDBUF_STATE_EMPTY;
>   rtems_chain_prepend (&bdbuf_cache.ready, &bd->link);
> 
>   if (rtems_bdbuf_avl_remove (&bdbuf_cache.tree, bd) != 0)
>     rtems_fatal_error_occurred (RTEMS_BLKDEV_FATAL_BDBUF_CONSISTENCY_9);
> }
> 
2009a2040,2053
>     /*
>      * Release requested buffer because it does not
>      * keep valid data.
>      */
>     if (req->status != RTEMS_SUCCESSFUL)
>     {
>         bd = req->bufs[0].user;
> 
>         if (bd->waiters)
>           wake_transfer = true;
> 
>         rtems_bdbuf_release_empty(bd);
>     }
> 
2013c2057
<       if (!bd->error)
---
>       if (req->status != RTEMS_SUCCESSFUL)
2015d2058
<       bd->state = RTEMS_BDBUF_STATE_READ_AHEAD;
2022c2065,2066
<       rtems_chain_prepend (&bdbuf_cache.ready, &bd->link);
---
>       if (bd->waiters)
>         wake_transfer = true;
2024,2029c2068
<       /*
<        * If there is an error remove the BD from the AVL tree as it is invalid,
<        * then wake any threads that may be waiting. A thread may have been
<        * waiting for this block and assumed it was in the tree.
<        */
<       if (bd->error)
---
>       if (req->status != RTEMS_SUCCESSFUL)
2031,2033c2070,2080
<         bd->state = RTEMS_BDBUF_STATE_EMPTY;
<         if (rtems_bdbuf_avl_remove (&bdbuf_cache.tree, bd) != 0)
<           rtems_fatal_error_occurred (RTEMS_BLKDEV_FATAL_BDBUF_CONSISTENCY_9);
---
>         /*
>          * If there is an error remove the BD from the AVL tree as it is invalid,
>          * then wake any threads that may be waiting. A thread may have been
>          * waiting for this block and assumed it was in the tree.
>          */
>         rtems_bdbuf_release_empty(bd);
>       }
>       else
>       {
>         bd->state = RTEMS_BDBUF_STATE_READ_AHEAD;
>         rtems_chain_prepend (&bdbuf_cache.ready, &bd->link);
2035,2037d2081
< 
<       if (bd->waiters)
<         wake_transfer = true;
2044c2088,2095
<     
---
>    
>     if (req->status != RTEMS_SUCCESSFUL)
>     {
>         rtems_bdbuf_unlock_pool (pool);
>         rtems_disk_release (dd);
>         return req->status;
>     }
>