ataflop: switch from req->errors to req->error_count

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>

diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c
index 2104b1b4ccda276dd324b12b843468c322a39ed5..fa69ecd52cb57cb226e1f9f177ef0c464ee3155a 100644 (file)
--- a/drivers/block/ataflop.c
+++ b/drivers/block/ataflop.c
@@ -617,12 +617,12 @@ static void fd_error( void )
        if (!fd_request)
                return;
 
-       fd_request->errors++;
-       if (fd_request->errors >= MAX_ERRORS) {
+       fd_request->error_count++;
+       if (fd_request->error_count >= MAX_ERRORS) {
                printk(KERN_ERR "fd%d: too many errors.\n", SelectedDrive );
                fd_end_request_cur(-EIO);
        }
-       else if (fd_request->errors == RECALIBRATE_ERRORS) {
+       else if (fd_request->error_count == RECALIBRATE_ERRORS) {
                printk(KERN_WARNING "fd%d: recalibrating\n", SelectedDrive );
                if (SelectedDrive != -1)
                        SUD.track = -1;
@@ -1386,7 +1386,7 @@ static void setup_req_params( int drive )
        ReqData = ReqBuffer + 512 * ReqCnt;
 
        if (UseTrackbuffer)
-               read_track = (ReqCmd == READ && fd_request->errors == 0);
+               read_track = (ReqCmd == READ && fd_request->error_count == 0);
        else
                read_track = 0;
 
@@ -1409,8 +1409,10 @@ static struct request *set_next_request(void)
                        fdc_queue = 0;
                if (q) {
                        rq = blk_fetch_request(q);
-                       if (rq)
+                       if (rq) {
+                               rq->error_count = 0;
                                break;
+                       }
                }
        } while (fdc_queue != old_pos);