block: replace end_request() with [__]blk_end_request_cur()

[deliverable/linux.git] / drivers / block / ataflop.c

diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c
index 4234c11c1e4cfe34592c9830eca7d2a68400b052..44a8702136a9a95da00cbe9ad2abb0fa272fd50d 100644 (file)
--- a/drivers/block/ataflop.c
+++ b/drivers/block/ataflop.c
@@ -612,7 +612,7 @@ static void fd_error( void )
        CURRENT->errors++;
        if (CURRENT->errors >= MAX_ERRORS) {
                printk(KERN_ERR "fd%d: too many errors.\n", SelectedDrive );
-               end_request(CURRENT, 0);
+               __blk_end_request_cur(CURRENT, -EIO);
        }
        else if (CURRENT->errors == RECALIBRATE_ERRORS) {
                printk(KERN_WARNING "fd%d: recalibrating\n", SelectedDrive );
@@ -734,7 +734,7 @@ static void do_fd_action( int drive )
                        /* all sectors finished */
                        CURRENT->nr_sectors -= CURRENT->current_nr_sectors;
                        CURRENT->sector += CURRENT->current_nr_sectors;
-                       end_request(CURRENT, 1);
+                       __blk_end_request_cur(CURRENT, 0);
                        redo_fd_request();
                        return;
                    }
@@ -1141,7 +1141,7 @@ static void fd_rwsec_done1(int status)
                /* all sectors finished */
                CURRENT->nr_sectors -= CURRENT->current_nr_sectors;
                CURRENT->sector += CURRENT->current_nr_sectors;
-               end_request(CURRENT, 1);
+               __blk_end_request_cur(CURRENT, 0);
                redo_fd_request();
        }
        return;
@@ -1414,7 +1414,7 @@ repeat:
        if (!UD.connected) {
                /* drive not connected */
                printk(KERN_ERR "Unknown Device: fd%d\n", drive );
-               end_request(CURRENT, 0);
+               __blk_end_request_cur(CURRENT, -EIO);
                goto repeat;
        }
                
@@ -1430,12 +1430,12 @@ repeat:
                /* user supplied disk type */
                if (--type >= NUM_DISK_MINORS) {
                        printk(KERN_WARNING "fd%d: invalid disk format", drive );
-                       end_request(CURRENT, 0);
+                       __blk_end_request_cur(CURRENT, -EIO);
                        goto repeat;
                }
                if (minor2disktype[type].drive_types > DriveType)  {
                        printk(KERN_WARNING "fd%d: unsupported disk format", drive );
-                       end_request(CURRENT, 0);
+                       __blk_end_request_cur(CURRENT, -EIO);
                        goto repeat;
                }
                type = minor2disktype[type].index;
@@ -1445,7 +1445,7 @@ repeat:
        }
        
        if (CURRENT->sector + 1 > UDT->blocks) {
-               end_request(CURRENT, 0);
+               __blk_end_request_cur(CURRENT, -EIO);
                goto repeat;
        }