1 files changed, 34 insertions, 32 deletions

diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c
index 4234c11c1e4c..f5e7180d7f47 100644
--- a/drivers/block/ataflop.c
+++ b/drivers/block/ataflop.c
@@ -79,9 +79,7 @@
 #undef DEBUG
 
 static struct request_queue *floppy_queue;
-
-#define QUEUE (floppy_queue)
-#define CURRENT elv_next_request(floppy_queue)
+static struct request *fd_request;
 
 /* Disk types: DD, HD, ED */
 static struct atari_disk_type {
@@ -376,6 +374,12 @@ static DEFINE_TIMER(readtrack_timer, fd_readtrack_check, 0, 0);
 static DEFINE_TIMER(timeout_timer, fd_times_out, 0, 0);
 static DEFINE_TIMER(fd_timer, check_change, 0, 0);
         
+static void fd_end_request_cur(int err)
+{
+        if (!__blk_end_request_cur(fd_request, err))
+                fd_request = NULL;
+}
+
 static inline void start_motor_off_timer(void)
 {
         mod_timer(&motor_off_timer, jiffies + FD_MOTOR_OFF_DELAY);
@@ -606,15 +610,15 @@ static void fd_error( void )
                 return;
         }
 
-        if (!CURRENT)
+        if (!fd_request)
                 return;
 
-        CURRENT->errors++;
-        if (CURRENT->errors >= MAX_ERRORS) {
+        fd_request->errors++;
+        if (fd_request->errors >= MAX_ERRORS) {
                 printk(KERN_ERR "fd%d: too many errors.\n", SelectedDrive );
-                end_request(CURRENT, 0);
+                fd_end_request_cur(-EIO);
         }
-        else if (CURRENT->errors == RECALIBRATE_ERRORS) {
+        else if (fd_request->errors == RECALIBRATE_ERRORS) {
                 printk(KERN_WARNING "fd%d: recalibrating\n", SelectedDrive );
                 if (SelectedDrive != -1)
                         SUD.track = -1;
@@ -725,16 +729,14 @@ static void do_fd_action( int drive )
             if (IS_BUFFERED( drive, ReqSide, ReqTrack )) {
                 if (ReqCmd == READ) {
                     copy_buffer( SECTOR_BUFFER(ReqSector), ReqData );
-                    if (++ReqCnt < CURRENT->current_nr_sectors) {
+                    if (++ReqCnt < blk_rq_cur_sectors(fd_request)) {
                         /* read next sector */
                         setup_req_params( drive );
                         goto repeat;
                     }
                     else {
                         /* all sectors finished */
-                        CURRENT->nr_sectors -= CURRENT->current_nr_sectors;
-                        CURRENT->sector += CURRENT->current_nr_sectors;
-                        end_request(CURRENT, 1);
+                        fd_end_request_cur(0);
                         redo_fd_request();
                         return;
                     }
@@ -1132,16 +1134,14 @@ static void fd_rwsec_done1(int status)
                 }
         }
   
-        if (++ReqCnt < CURRENT->current_nr_sectors) {
+        if (++ReqCnt < blk_rq_cur_sectors(fd_request)) {
                 /* read next sector */
                 setup_req_params( SelectedDrive );
                 do_fd_action( SelectedDrive );
         }
         else {
                 /* all sectors finished */
-                CURRENT->nr_sectors -= CURRENT->current_nr_sectors;
-                CURRENT->sector += CURRENT->current_nr_sectors;
-                end_request(CURRENT, 1);
+                fd_end_request_cur(0);
                 redo_fd_request();
         }
         return;
@@ -1382,7 +1382,7 @@ static void setup_req_params( int drive )
         ReqData = ReqBuffer + 512 * ReqCnt;
 
         if (UseTrackbuffer)
-                read_track = (ReqCmd == READ && CURRENT->errors == 0);
+                read_track = (ReqCmd == READ && fd_request->errors == 0);
         else
                 read_track = 0;
 
@@ -1396,25 +1396,27 @@ static void redo_fd_request(void)
         int drive, type;
         struct atari_floppy_struct *floppy;
 
-        DPRINT(("redo_fd_request: CURRENT=%p dev=%s CURRENT->sector=%ld\n",
-                CURRENT, CURRENT ? CURRENT->rq_disk->disk_name : "",
-                CURRENT ? CURRENT->sector : 0 ));
+        DPRINT(("redo_fd_request: fd_request=%p dev=%s fd_request->sector=%ld\n",
+                fd_request, fd_request ? fd_request->rq_disk->disk_name : "",
+                fd_request ? blk_rq_pos(fd_request) : 0 ));
 
         IsFormatting = 0;
 
 repeat:
+        if (!fd_request) {
+                fd_request = blk_fetch_request(floppy_queue);
+                if (!fd_request)
+                        goto the_end;
+        }
 
-        if (!CURRENT)
-                goto the_end;
-
-        floppy = CURRENT->rq_disk->private_data;
+        floppy = fd_request->rq_disk->private_data;
         drive = floppy - unit;
         type = floppy->type;
         
         if (!UD.connected) {
                 /* drive not connected */
                 printk(KERN_ERR "Unknown Device: fd%d\n", drive );
-                end_request(CURRENT, 0);
+                fd_end_request_cur(-EIO);
                 goto repeat;
         }
                 
@@ -1430,12 +1432,12 @@ repeat:
                 /* user supplied disk type */
                 if (--type >= NUM_DISK_MINORS) {
                         printk(KERN_WARNING "fd%d: invalid disk format", drive );
-                        end_request(CURRENT, 0);
+                        fd_end_request_cur(-EIO);
                         goto repeat;
                 }
                 if (minor2disktype[type].drive_types > DriveType)  {
                         printk(KERN_WARNING "fd%d: unsupported disk format", drive );
-                        end_request(CURRENT, 0);
+                        fd_end_request_cur(-EIO);
                         goto repeat;
                 }
                 type = minor2disktype[type].index;
@@ -1444,8 +1446,8 @@ repeat:
                 UD.autoprobe = 0;
         }
         
-        if (CURRENT->sector + 1 > UDT->blocks) {
-                end_request(CURRENT, 0);
+        if (blk_rq_pos(fd_request) + 1 > UDT->blocks) {
+                fd_end_request_cur(-EIO);
                 goto repeat;
         }
 
@@ -1453,9 +1455,9 @@ repeat:
         del_timer( &motor_off_timer );
                 
         ReqCnt = 0;
-        ReqCmd = rq_data_dir(CURRENT);
-        ReqBlock = CURRENT->sector;
-        ReqBuffer = CURRENT->buffer;
+        ReqCmd = rq_data_dir(fd_request);
+        ReqBlock = blk_rq_pos(fd_request);
+        ReqBuffer = fd_request->buffer;
         setup_req_params( drive );
         do_fd_action( drive );