[PATCH] (14/14) resync

end_request(int) turned to end_request(req, int); all old callers
are converted to end_request(CURRENT, value).  Now we can start
killing CURRENT/QUEUE - end_request() was the last obstacle to
that.

11 files changed, 76 insertions, 76 deletions

diff --git a/drivers/block/acsi.c b/drivers/block/acsi.c
index 201988ef0e43..c35ef7f77e40 100644
--- a/drivers/block/acsi.c
+++ b/drivers/block/acsi.c
@@ -775,7 +775,7 @@ static void bad_rw_intr( void )
 		return;
 
 	if (++CURRENT->errors >= MAX_ERRORS)
-		end_request(0);
+		end_request(CURRENT, 0);
 	/* Otherwise just retry */
 }
 
@@ -851,7 +851,7 @@ static void acsi_times_out( unsigned long dummy )
 #ifdef DEBUG
 		printk( KERN_ERR "ACSI: too many errors.\n" );
 #endif
-		end_request(0);
+		end_request(CURRENT, 0);
 	}
 
 	redo_acsi_request();
@@ -919,7 +919,7 @@ static void do_end_requests( void )
 		CURRENT->current_nr_sectors -= CurrentNSect;
 		CURRENT->sector += CurrentNSect;
 		if (CURRENT->nr_sectors == 0)
-			end_request(1);
+			end_request(CURRENT, 1);
 	}
 	else {
 		for( i = 0; i < CurrentNReq; ++i ) {
@@ -927,7 +927,7 @@ static void do_end_requests( void )
 			CURRENT->nr_sectors -= n;
 			CURRENT->current_nr_sectors -= n;
 			CURRENT->sector += n;
-			end_request(1);
+			end_request(CURRENT, 1);
 		}
 	}
 }
@@ -986,13 +986,13 @@ static void redo_acsi_request( void )
 		       block, block + CURRENT->nr_sectors - 1,
 		       acsi_part[dev].nr_sects);
 #endif
-		end_request(0);
+		end_request(CURRENT, 0);
 		goto repeat;
 	}
 	if (acsi_info[DEVICE_NR(dev)].changed) {
 		printk( KERN_NOTICE "ad%c: request denied because cartridge has "
 				"been changed.\n", DEVICE_NR(dev)+'a' );
-		end_request(0);
+		end_request(CURRENT, 0);
 		goto repeat;
 	}
 	
diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c
index afa2f941a958..eb4ab17018a3 100644
--- a/drivers/block/amiflop.c
+++ b/drivers/block/amiflop.c
@@ -1407,7 +1407,7 @@ static void redo_fd_request(void)
 #endif
 		block = CURRENT->sector + cnt;
 		if ((int)block > floppy->blocks) {
-			end_request(0);
+			end_request(CURRENT, 0);
 			goto repeat;
 		}
 
@@ -1421,11 +1421,11 @@ static void redo_fd_request(void)
 
 		if ((rq_data_dir(CURRENT) != READ) && (rq_data_dir(CURRENT) != WRITE)) {
 			printk(KERN_WARNING "do_fd_request: unknown command\n");
-			end_request(0);
+			end_request(CURRENT, 0);
 			goto repeat;
 		}
 		if (get_track(drive, track) == -1) {
-			end_request(0);
+			end_request(CURRENT, 0);
 			goto repeat;
 		}
 
@@ -1439,7 +1439,7 @@ static void redo_fd_request(void)
 
 			/* keep the drive spinning while writes are scheduled */
 			if (!fd_motor_on(drive)) {
-				end_request(0);
+				end_request(CURRENT, 0);
 				goto repeat;
 			}
 			/*
@@ -1462,7 +1462,7 @@ static void redo_fd_request(void)
 	CURRENT->nr_sectors -= CURRENT->current_nr_sectors;
 	CURRENT->sector += CURRENT->current_nr_sectors;
 
-	end_request(1);
+	end_request(CURRENT, 1);
 	goto repeat;
 }
 
diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c
index d47daf8b428f..af8f966f4eb3 100644
--- a/drivers/block/ataflop.c
+++ b/drivers/block/ataflop.c
@@ -634,7 +634,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( 0 );
+		end_request(CURRENT, 0);
 	}
 	else if (CURRENT->errors == RECALIBRATE_ERRORS) {
 		printk(KERN_WARNING "fd%d: recalibrating\n", SelectedDrive );
@@ -759,7 +759,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( 1 );
+			end_request(CURRENT, 1);
 			redo_fd_request();
 			return;
 		    }
@@ -1166,7 +1166,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( 1 );
+		end_request(CURRENT, 1);
 		redo_fd_request();
 	}
 	return;
@@ -1468,7 +1468,7 @@ repeat:
 	if (!UD.connected) {
 		/* drive not connected */
 		printk(KERN_ERR "Unknown Device: fd%d\n", drive );
-		end_request(0);
+		end_request(CURRENT, 0);
 		goto repeat;
 	}
 		
@@ -1484,12 +1484,12 @@ repeat:
 		/* user supplied disk type */
 		if (--type >= NUM_DISK_MINORS) {
 			printk(KERN_WARNING "fd%d: invalid disk format", drive );
-			end_request( 0 );
+			end_request(CURRENT, 0);
 			goto repeat;
 		}
 		if (minor2disktype[type].drive_types > DriveType)  {
 			printk(KERN_WARNING "fd%d: unsupported disk format", drive );
-			end_request( 0 );
+			end_request(CURRENT, 0);
 			goto repeat;
 		}
 		type = minor2disktype[type].index;
@@ -1499,7 +1499,7 @@ repeat:
 	}
 	
 	if (CURRENT->sector + 1 > UDT->blocks) {
-		end_request(0);
+		end_request(CURRENT, 0);
 		goto repeat;
 	}
 
diff --git a/drivers/block/paride/pcd.c b/drivers/block/paride/pcd.c
index 04dd695cc51c..dd6e2a49bdbd 100644
--- a/drivers/block/paride/pcd.c
+++ b/drivers/block/paride/pcd.c
@@ -775,7 +775,7 @@ static void do_pcd_request (request_queue_t * q)
 	        ps_set_intr(do_pcd_read,0,0,nice); 
 		return;
 	    } 
-	    else end_request(0);
+	    else end_request(CURRENT, 0);
 	}
 }
 
@@ -817,7 +817,7 @@ static void pcd_start( void )
 		pcd_bufblk = -1; 
 		spin_lock_irqsave(&pcd_lock,saved_flags);
 		pcd_busy = 0;
-		end_request(0);
+		end_request(CURRENT, 0);
 		do_pcd_request(NULL);
 		spin_unlock_irqrestore(&pcd_lock,saved_flags);
 		return;
@@ -840,7 +840,7 @@ static void do_pcd_read( void )
 	pcd_transfer();
 	if (!pcd_count) {
 		spin_lock_irqsave(&pcd_lock,saved_flags);
-		end_request(1);
+		end_request(CURRENT, 1);
 		pcd_busy = 0;
 		do_pcd_request(NULL);
 		spin_unlock_irqrestore(&pcd_lock,saved_flags);
@@ -865,7 +865,7 @@ static void do_pcd_read_drq( void )
 		spin_lock_irqsave(&pcd_lock,saved_flags);
 		pcd_busy = 0;
 		pcd_bufblk = -1;
-		end_request(0);
+		end_request(CURRENT, 0);
 		do_pcd_request(NULL);
 		spin_unlock_irqrestore(&pcd_lock,saved_flags);
 		return;
diff --git a/drivers/block/paride/pd.c b/drivers/block/paride/pd.c
index 535fa5d994bc..2cb5c023cce3 100644
--- a/drivers/block/paride/pd.c
+++ b/drivers/block/paride/pd.c
@@ -845,7 +845,7 @@ repeat:
 
         if ((pd_dev >= PD_DEVS) || 
 	    ((pd_block+pd_count) > pd_hd[pd_dev].nr_sects)) {
-                end_request(0);
+                end_request(CURRENT, 0);
                 goto repeat;
         }
 
@@ -857,7 +857,7 @@ repeat:
         if (pd_cmd == READ) pi_do_claimed(PI,do_pd_read);
         else if (pd_cmd == WRITE) pi_do_claimed(PI,do_pd_write);
         else {  pd_busy = 0;
-		end_request(0);
+		end_request(CURRENT, 0);
                 goto repeat;
         }
 }
@@ -867,7 +867,7 @@ static void pd_next_buf( int unit )
 {	long	saved_flags;
 
 	spin_lock_irqsave(&pd_lock,saved_flags);
-	end_request(1);
+	end_request(CURRENT, 1);
 	if (!pd_run) {  spin_unlock_irqrestore(&pd_lock,saved_flags);
 			return; 
 	}
@@ -907,7 +907,7 @@ static void do_pd_read_start( void )
 			return;
                 }
 		spin_lock_irqsave(&pd_lock,saved_flags);
-                end_request(0);
+                end_request(CURRENT, 0);
                 pd_busy = 0;
 		do_pd_request(NULL);
 		spin_unlock_irqrestore(&pd_lock,saved_flags);
@@ -931,7 +931,7 @@ static void do_pd_read_drq( void )
                         return;
                 }
 		spin_lock_irqsave(&pd_lock,saved_flags);
-                end_request(0);
+                end_request(CURRENT, 0);
                 pd_busy = 0;
 		do_pd_request(NULL);
 		spin_unlock_irqrestore(&pd_lock,saved_flags);
@@ -946,7 +946,7 @@ static void do_pd_read_drq( void )
         }
         pi_disconnect(PI);
 	spin_lock_irqsave(&pd_lock,saved_flags);
-        end_request(1);
+        end_request(CURRENT, 1);
         pd_busy = 0;
 	do_pd_request(NULL);
 	spin_unlock_irqrestore(&pd_lock,saved_flags);
@@ -973,7 +973,7 @@ static void do_pd_write_start( void )
                         return;
                 }
 		spin_lock_irqsave(&pd_lock,saved_flags);
-                end_request(0);
+                end_request(CURRENT, 0);
                 pd_busy = 0;
 		do_pd_request(NULL);
 		spin_unlock_irqrestore(&pd_lock,saved_flags);
@@ -989,7 +989,7 @@ static void do_pd_write_start( void )
                         return;
                 }
 		spin_lock_irqsave(&pd_lock,saved_flags);
-                end_request(0);
+                end_request(CURRENT, 0);
                 pd_busy = 0;
 		do_pd_request(NULL);
                 spin_unlock_irqrestore(&pd_lock,saved_flags);
@@ -1018,7 +1018,7 @@ static void do_pd_write_done( void )
                         return;
                 }
 		spin_lock_irqsave(&pd_lock,saved_flags);
-                end_request(0);
+                end_request(CURRENT, 0);
                 pd_busy = 0;
 		do_pd_request(NULL);
 		spin_unlock_irqrestore(&pd_lock,saved_flags);
@@ -1026,7 +1026,7 @@ static void do_pd_write_done( void )
         }
         pi_disconnect(PI);
 	spin_lock_irqsave(&pd_lock,saved_flags);
-        end_request(1);
+        end_request(CURRENT, 1);
         pd_busy = 0;
 	do_pd_request(NULL);
 	spin_unlock_irqrestore(&pd_lock,saved_flags);
diff --git a/drivers/block/paride/pf.c b/drivers/block/paride/pf.c
index 1f572c7eed9d..578feaadbb38 100644
--- a/drivers/block/paride/pf.c
+++ b/drivers/block/paride/pf.c
@@ -849,7 +849,7 @@ repeat:
         pf_count = CURRENT->current_nr_sectors;
 
         if ((pf_unit >= PF_UNITS) || (pf_block+pf_count > PF.capacity)) {
-                end_request(0);
+                end_request(CURRENT, 0);
                 goto repeat;
         }
 
@@ -861,7 +861,7 @@ repeat:
         if (pf_cmd == READ) pi_do_claimed(PI,do_pf_read);
         else if (pf_cmd == WRITE) pi_do_claimed(PI,do_pf_write);
         else {  pf_busy = 0;
-		end_request(0);
+		end_request(CURRENT, 0);
                 goto repeat;
         }
 }
@@ -871,7 +871,7 @@ static void pf_next_buf( int unit )
 {	long	saved_flags;
 
 	spin_lock_irqsave(&pf_spin_lock,saved_flags);
-	end_request(1);
+	end_request(CURRENT, 1);
 	if (!pf_run) { spin_unlock_irqrestore(&pf_spin_lock,saved_flags);
 		       return; 
 	}
@@ -912,7 +912,7 @@ static void do_pf_read_start( void )
 			return;
                 }
 		spin_lock_irqsave(&pf_spin_lock,saved_flags);
-                end_request(0);
+                end_request(CURRENT, 0);
                 pf_busy = 0;
 		do_pf_request(NULL);
 		spin_unlock_irqrestore(&pf_spin_lock,saved_flags);
@@ -938,7 +938,7 @@ static void do_pf_read_drq( void )
                         return;
                 }
 		spin_lock_irqsave(&pf_spin_lock,saved_flags);
-                end_request(0);
+                end_request(CURRENT, 0);
                 pf_busy = 0;
 		do_pf_request(NULL);
 		spin_unlock_irqrestore(&pf_spin_lock,saved_flags);
@@ -953,7 +953,7 @@ static void do_pf_read_drq( void )
         }
         pi_disconnect(PI);
 	spin_lock_irqsave(&pf_spin_lock,saved_flags); 
-        end_request(1);
+        end_request(CURRENT, 1);
         pf_busy = 0;
 	do_pf_request(NULL);
 	spin_unlock_irqrestore(&pf_spin_lock,saved_flags);
@@ -979,7 +979,7 @@ static void do_pf_write_start( void )
 			return;
                 }
 		spin_lock_irqsave(&pf_spin_lock,saved_flags);
-                end_request(0);
+                end_request(CURRENT, 0);
                 pf_busy = 0;
 		do_pf_request(NULL);
 		spin_unlock_irqrestore(&pf_spin_lock,saved_flags);
@@ -996,7 +996,7 @@ static void do_pf_write_start( void )
                         return;
                 }
 		spin_lock_irqsave(&pf_spin_lock,saved_flags);
-                end_request(0);
+                end_request(CURRENT, 0);
                 pf_busy = 0;
 		do_pf_request(NULL);
 		spin_unlock_irqrestore(&pf_spin_lock,saved_flags);
@@ -1026,7 +1026,7 @@ static void do_pf_write_done( void )
                         return;
                 }
 		spin_lock_irqsave(&pf_spin_lock,saved_flags);
-                end_request(0);
+                end_request(CURRENT, 0);
                 pf_busy = 0;
 		do_pf_request(NULL);
 		spin_unlock_irqrestore(&pf_spin_lock,saved_flags);
@@ -1034,7 +1034,7 @@ static void do_pf_write_done( void )
         }
         pi_disconnect(PI);
 	spin_lock_irqsave(&pf_spin_lock,saved_flags);
-        end_request(1);
+        end_request(CURRENT, 1);
         pf_busy = 0;
 	do_pf_request(NULL);
 	spin_unlock_irqrestore(&pf_spin_lock,saved_flags);
diff --git a/drivers/block/ps2esdi.c b/drivers/block/ps2esdi.c
index f4199efa209f..bd604cee4663 100644
--- a/drivers/block/ps2esdi.c
+++ b/drivers/block/ps2esdi.c
@@ -510,7 +510,7 @@ static void do_ps2esdi_request(request_queue_t * q)
 
 	if (isa_virt_to_bus(CURRENT->buffer + CURRENT->current_nr_sectors * 512) > 16 * MB) {
 		printk("%s: DMA above 16MB not supported\n", DEVICE_NAME);
-		end_request(FAIL);
+		end_request(CURRENT, FAIL);
 	}			/* check for above 16Mb dmas */
 	else if ((DEVICE_NR(CURRENT->rq_dev) < ps2esdi_drives) &&
 	    (CURRENT->sector + CURRENT->current_nr_sectors <=
@@ -536,7 +536,7 @@ static void do_ps2esdi_request(request_queue_t * q)
 			break;
 		default:
 			printk("%s: Unknown command\n", DEVICE_NAME);
-			end_request(FAIL);
+			end_request(CURRENT, FAIL);
 			break;
 		}		/* handle different commands */
 	}
@@ -544,7 +544,7 @@ static void do_ps2esdi_request(request_queue_t * q)
 	else {
 		printk("Grrr. error. ps2esdi_drives: %d, %lu %lu\n", ps2esdi_drives,
 		       CURRENT->sector, ps2esdi[minor(CURRENT->rq_dev)].nr_sects);
-		end_request(FAIL);
+		end_request(CURRENT, FAIL);
 	}
 
 }				/* main strategy routine */
@@ -609,7 +609,7 @@ static void ps2esdi_readwrite(int cmd, u_char drive, u_int block, u_int count)
 	if (ps2esdi_out_cmd_blk(cmd_blk)) {
 		printk("%s: Controller failed\n", DEVICE_NAME);
 		if ((++CURRENT->errors) >= MAX_RETRIES)
-			end_request(FAIL);
+			end_request(CURRENT, FAIL);
 	}
 	/* check for failure to put out the command block */ 
 	else {
@@ -984,7 +984,7 @@ static void ps2esdi_normal_interrupt_handler(u_int int_ret_code)
 	}
 	if(ending != -1) {
 		spin_lock_irqsave(&ps2esdi_lock, flags);
-		end_request(ending);
+		end_request(CURRENT, ending);
 		do_ps2esdi_request(BLK_DEFAULT_QUEUE(MAJOR_NR));
 		spin_unlock_irqrestore(&ps2esdi_lock, flags);
 	}
diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c
index 8b430af60202..92180c3c5108 100644
--- a/drivers/block/swim3.c
+++ b/drivers/block/swim3.c
@@ -329,15 +329,15 @@ static void start_request(struct floppy_state *fs)
 #endif
 
 		if (CURRENT->sector < 0 || CURRENT->sector >= fs->total_secs) {
-			end_request(0);
+			end_request(CURRENT, 0);
 			continue;
 		}
 		if (CURRENT->current_nr_sectors == 0) {
-			end_request(1);
+			end_request(CURRENT, 1);
 			continue;
 		}
 		if (fs->ejected) {
-			end_request(0);
+			end_request(CURRENT, 0);
 			continue;
 		}
 
@@ -345,7 +345,7 @@ static void start_request(struct floppy_state *fs)
 			if (fs->write_prot < 0)
 				fs->write_prot = swim3_readbit(fs, WRITE_PROT);
 			if (fs->write_prot) {
-				end_request(0);
+				end_request(CURRENT, 0);
 				continue;
 			}
 		}
@@ -516,7 +516,7 @@ static void act(struct floppy_state *fs)
 		case do_transfer:
 			if (fs->cur_cyl != fs->req_cyl) {
 				if (fs->retries > 5) {
-					end_request(0);
+					end_request(CURRENT, 0);
 					fs->state = idle;
 					return;
 				}
@@ -548,7 +548,7 @@ static void scan_timeout(unsigned long data)
 	out_8(&sw->intr_enable, 0);
 	fs->cur_cyl = -1;
 	if (fs->retries > 5) {
-		end_request(0);
+		end_request(CURRENT, 0);
 		fs->state = idle;
 		start_request(fs);
 	} else {
@@ -577,7 +577,7 @@ static void seek_timeout(unsigned long data)
 		return;
 	}
 	printk(KERN_ERR "swim3: seek timeout\n");
-	end_request(0);
+	end_request(CURRENT, 0);
 	fs->state = idle;
 	start_request(fs);
 }
@@ -605,7 +605,7 @@ static void xfer_timeout(unsigned long data)
 	CURRENT->current_nr_sectors -= s;
 	printk(KERN_ERR "swim3: timeout %sing sector %ld\n",
 	       (rq_data_dir(CURRENT)==WRITE? "writ": "read"), CURRENT->sector);
-	end_request(0);
+	end_request(CURRENT, 0);
 	fs->state = idle;
 	start_request(fs);
 }
@@ -639,7 +639,7 @@ static void swim3_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 				printk(KERN_ERR "swim3: seen sector but cyl=ff?\n");
 				fs->cur_cyl = -1;
 				if (fs->retries > 5) {
-					end_request(0);
+					end_request(CURRENT, 0);
 					fs->state = idle;
 					start_request(fs);
 				} else {
@@ -710,7 +710,7 @@ static void swim3_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 				printk("swim3: error %sing block %ld (err=%x)\n",
 				       rq_data_dir(CURRENT) == WRITE? "writ": "read",
 				       CURRENT->sector, err);
-				end_request(0);
+				end_request(CURRENT, 0);
 				fs->state = idle;
 			}
 		} else {
@@ -719,7 +719,7 @@ static void swim3_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 				printk(KERN_ERR "swim3: fd dma: stat=%x resid=%d\n", stat, resid);
 				printk(KERN_ERR "  state=%d, dir=%lx, intr=%x, err=%x\n",
 				       fs->state, rq_data_dir(CURRENT), intr, err);
-				end_request(0);
+				end_request(CURRENT, 0);
 				fs->state = idle;
 				start_request(fs);
 				break;
@@ -728,7 +728,7 @@ static void swim3_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 			CURRENT->current_nr_sectors -= fs->scount;
 			CURRENT->buffer += fs->scount * 512;
 			if (CURRENT->current_nr_sectors <= 0) {
-				end_request(1);
+				end_request(CURRENT, 1);
 				fs->state = idle;
 			} else {
 				fs->req_sector += fs->scount;
diff --git a/drivers/block/swim_iop.c b/drivers/block/swim_iop.c
index a25129ddbb3d..ad0a73046b3e 100644
--- a/drivers/block/swim_iop.c
+++ b/drivers/block/swim_iop.c
@@ -100,7 +100,7 @@ static char *drive_names[7] = {
 
 int swimiop_init(void);
 static void swimiop_init_request(struct swim_iop_req *);
-static int swimiop_send_request(struct swim_iop_req *);
+static int swimiop_send_request(CURRENT, struct swim_iop_req *);
 static void swimiop_receive(struct iop_msg *, struct pt_regs *);
 static void swimiop_status_update(int, struct swim_drvstatus *);
 static int swimiop_eject(struct floppy_state *fs);
@@ -171,7 +171,7 @@ int swimiop_init(void)
 		swimiop_init_request(&req);
 		cmd->code = CMD_STATUS;
 		cmd->drive_num = i + 1;
-		if (swimiop_send_request(&req) != 0) continue;
+		if (swimiop_send_request(CURRENT, &req) != 0) continue;
 		while (!req.complete);
 		if (cmd->error != 0) {
 			printk(KERN_ERR "SWIM-IOP: probe on drive %d returned error %d\n", i, (uint) cmd->error);
@@ -204,7 +204,7 @@ static void swimiop_init_request(struct swim_iop_req *req)
 	req->done = NULL;
 }
 
-static int swimiop_send_request(struct swim_iop_req *req)
+static int swimiop_send_request(CURRENT, struct swim_iop_req *req)
 {
 	unsigned long cpu_flags;
 	int err;
@@ -319,7 +319,7 @@ static int swimiop_eject(struct floppy_state *fs)
 	swimiop_init_request(&req);
 	cmd->code = CMD_EJECT;
 	cmd->drive_num = fs->drive_num;
-	err = swimiop_send_request(&req);
+	err = swimiop_send_request(CURRENT, &req);
 	if (err) {
 		release_drive(fs);
 		return err;
@@ -523,12 +523,12 @@ static void fd_request_complete(struct swim_iop_req *req)
 	fs->state = idle;
 	if (cmd->error) {
 		printk(KERN_ERR "SWIM-IOP: error %d on read/write request.\n", cmd->error);
-		end_request(0);
+		end_request(CURRENT, 0);
 	} else {
 		CURRENT->sector += cmd->num_blocks;
 		CURRENT->current_nr_sectors -= cmd->num_blocks;
 		if (CURRENT->current_nr_sectors <= 0) {
-			end_request(1);
+			end_request(CURRENT, 1);
 			return;
 		}
 	}
@@ -540,7 +540,7 @@ static void fd_request_timeout(unsigned long data)
 	struct floppy_state *fs = (struct floppy_state *) data;
 
 	fs->timeout_pending = 0;
-	end_request(0);
+	end_request(CURRENT, 0);
 	fs->state = idle;
 }
 
@@ -568,15 +568,15 @@ static void start_request(struct floppy_state *fs)
 #endif
 
 		if (CURRENT->sector < 0 || CURRENT->sector >= fs->total_secs) {
-			end_request(0);
+			end_request(CURRENT, 0);
 			continue;
 		}
 		if (CURRENT->current_nr_sectors == 0) {
-			end_request(1);
+			end_request(CURRENT, 1);
 			continue;
 		}
 		if (fs->ejected) {
-			end_request(0);
+			end_request(CURRENT, 0);
 			continue;
 		}
 
@@ -586,7 +586,7 @@ static void start_request(struct floppy_state *fs)
 
 		if (CURRENT->cmd == WRITE) {
 			if (fs->write_prot) {
-				end_request(0);
+				end_request(CURRENT, 0);
 				continue;
 			}
 			cmd->code = CMD_WRITE;
@@ -599,8 +599,8 @@ static void start_request(struct floppy_state *fs)
 		cmd->first_block = CURRENT->sector;
 		cmd->num_blocks = CURRENT->current_nr_sectors;
 
-		if (swimiop_send_request(&req)) {
-			end_request(0);
+		if (swimiop_send_request(CURRENT, &req)) {
+			end_request(CURRENT, 0);
 			continue;
 		}
 
diff --git a/drivers/block/xd.c b/drivers/block/xd.c
index d8c31e7be62b..bca8cd457e0e 100644
--- a/drivers/block/xd.c
+++ b/drivers/block/xd.c
@@ -306,7 +306,7 @@ static void do_xd_request (request_queue_t * q)
 					break;
 			}
 		}
-		end_request(code);	/* wrap up, 0 = fail, 1 = success */
+		end_request(CURRENT, code);	/* wrap up, 0 = fail, 1 = success */
 	}
 }
 
diff --git a/drivers/block/z2ram.c b/drivers/block/z2ram.c
index 2df97e263dc0..4a862df95556 100644
--- a/drivers/block/z2ram.c
+++ b/drivers/block/z2ram.c
@@ -89,14 +89,14 @@ do_z2_request( request_queue_t * q )
 	    printk( KERN_ERR DEVICE_NAME ": bad access: block=%lu, count=%u\n",
 		CURRENT->sector,
 		CURRENT->current_nr_sectors);
-	    end_request( FALSE );
+	    end_request(CURRENT, FALSE);
 	    continue;
 	}
 
 	if ( ( rq_data_dir(CURRENT) != READ ) && ( rq_data_dir(CURRENT) != WRITE ) )
 	{
 	    printk( KERN_ERR DEVICE_NAME ": bad command: %ld\n", rq_data_dir(CURRENT) );
-	    end_request( FALSE );
+	    end_request(CURRENT, FALSE);
 	    continue;
 	}
 
@@ -118,7 +118,7 @@ do_z2_request( request_queue_t * q )
 	    len -= size;
 	}
 
-	end_request( TRUE );
+	end_request(CURRENT, TRUE);
     }
 }