floppy: switch from req->errors to req->error_count
authorChristoph Hellwig <hch@lst.de>
Thu, 20 Apr 2017 14:03:12 +0000 (16:03 +0200)
committerJens Axboe <axboe@fb.com>
Thu, 20 Apr 2017 18:16:10 +0000 (12:16 -0600)
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
drivers/block/floppy.c

index ce102ec47ef28a00ec9bcb00f9edaf1e39d0eacd..60d4c765317833ec75ef6637104325b96084cc11 100644 (file)
@@ -2805,8 +2805,10 @@ static int set_next_request(void)
                        fdc_queue = 0;
                if (q) {
                        current_req = blk_fetch_request(q);
-                       if (current_req)
+                       if (current_req) {
+                               current_req->error_count = 0;
                                break;
+                       }
                }
        } while (fdc_queue != old_pos);
 
@@ -2866,7 +2868,7 @@ do_request:
                _floppy = floppy_type + DP->autodetect[DRS->probed_format];
        } else
                probing = 0;
-       errors = &(current_req->errors);
+       errors = &(current_req->error_count);
        tmp = make_raw_rw_request();
        if (tmp < 2) {
                request_done(tmp);