[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.

10 files changed, 67 insertions, 67 deletions

diff --git a/drivers/cdrom/aztcd.c b/drivers/cdrom/aztcd.c
index f805867ee423..03e0f80b4b0b 100644
--- a/drivers/cdrom/aztcd.c
+++ b/drivers/cdrom/aztcd.c
@@ -1598,21 +1598,21 @@ static void do_aztcd_request(request_queue_t * q)
 #endif
 	if (DiskInfo.audio) {
 		printk("aztcd: Error, tried to mount an Audio CD\n");
-		end_request(0);
+		end_request(CURRENT, 0);
 		return;
 	}
 	azt_transfer_is_active = 1;
 	while (current_valid()) {
 		azt_transfer();
 		if (CURRENT->nr_sectors == 0) {
-			end_request(1);
+			end_request(CURRENT, 1);
 		} else {
 			azt_buf_out = -1;	/* Want to read a block not in buffer */
 			if (azt_state == AZT_S_IDLE) {
 				if ((!aztTocUpToDate) || aztDiskChanged) {
 					if (aztUpdateToc() < 0) {
 						while (current_valid())
-							end_request(0);
+							end_request(CURRENT, 0);
 						break;
 					}
 				}
@@ -2009,7 +2009,7 @@ static void azt_poll(void)
 				loop_ctl = 0;
 			}
 			if (current_valid())
-				end_request(0);
+				end_request(CURRENT, 0);
 			AztTries = 5;
 		}
 		azt_error = 0;
@@ -2058,7 +2058,7 @@ static void azt_poll(void)
 						aztDiskChanged = 1;
 						aztTocUpToDate = 0;
 						azt_invalidate_buffers();
-						end_request(0);
+						end_request(CURRENT, 0);
 						printk
 						    ("aztcd: Disk Changed or Not Ready 1 - Unmount Disk!\n");
 					}
@@ -2072,7 +2072,7 @@ static void azt_poll(void)
 				aztTocUpToDate = 0;
 				printk
 				    ("aztcd: Disk Changed or Not Ready 2 - Unmount Disk!\n");
-				end_request(0);
+				end_request(CURRENT, 0);
 				printk((st & AST_DOOR_OPEN) ?
 				       "aztcd: door open\n" :
 				       "aztcd: disk removed\n");
@@ -2118,7 +2118,7 @@ static void azt_poll(void)
 						azt_invalidate_buffers();
 						printk
 						    ("aztcd: Disk Changed or Not Ready 3 - Unmount Disk!\n");
-						end_request(0);
+						end_request(CURRENT, 0);
 					}
 				} else
 					break;
@@ -2294,7 +2294,7 @@ static void azt_poll(void)
 						azt_read_count = 0;
 						azt_state = AZT_S_STOP;
 						loop_ctl = 1;
-						end_request(1);	/*should we have here (1) or (0)? */
+						end_request(CURRENT, 1);	/*should we have here (1) or (0)? */
 					} else {
 						if (azt_read_mode ==
 						    AZT_MODE_2) {
@@ -2339,7 +2339,7 @@ static void azt_poll(void)
 						azt_transfer();
 						if (CURRENT->nr_sectors ==
 						    0)
-							end_request(1);
+							end_request(CURRENT, 1);
 						else
 							break;
 					}
@@ -2414,7 +2414,7 @@ static void azt_poll(void)
 				azt_invalidate_buffers();
 				printk
 				    ("aztcd: Disk Changed or Not Ready 4 - Unmount Disk!\n");
-				end_request(0);
+				end_request(CURRENT, 0);
 			}
 
 #ifdef AZT_TEST3
diff --git a/drivers/cdrom/cdu31a.c b/drivers/cdrom/cdu31a.c
index 2040f93835c6..b57c880afe27 100644
--- a/drivers/cdrom/cdu31a.c
+++ b/drivers/cdrom/cdu31a.c
@@ -1606,7 +1606,7 @@ static void do_cdu31a_request(request_queue_t * q)
 
 		if (!sony_toc_read) {
 			printk("CDU31A: TOC not read\n");
-			end_request(0);
+			end_request(CURRENT, 0);
 			goto cdu31a_request_startover;
 		}
 
@@ -1620,14 +1620,14 @@ static void do_cdu31a_request(request_queue_t * q)
 				if ((block / 4) >= sony_toc.lead_out_start_lba) {
 					printk
 						("CDU31A: Request past end of media\n");
-					end_request(0);
+					end_request(CURRENT, 0);
 					goto cdu31a_request_startover;
 				}
 				if (((block + nblock) / 4) >=
 				    sony_toc.lead_out_start_lba) {
 					printk
 						("CDU31A: Request past end of media\n");
-					end_request(0);
+					end_request(CURRENT, 0);
 					goto cdu31a_request_startover;
 				}
 
@@ -1638,7 +1638,7 @@ static void do_cdu31a_request(request_queue_t * q)
 
 				if (!sony_toc_read) {
 					printk("CDU31A: TOC not read\n");
-					end_request(0);
+					end_request(CURRENT, 0);
 					goto cdu31a_request_startover;
 				}
 
@@ -1647,7 +1647,7 @@ static void do_cdu31a_request(request_queue_t * q)
 				if (sony_blocks_left == 0) {
 					if (start_request
 					    (block / 4, CDU31A_READAHEAD / 4, 0)) {
-						end_request(0);
+						end_request(CURRENT, 0);
 						goto cdu31a_request_startover;
 					}
 				}
@@ -1663,14 +1663,14 @@ static void do_cdu31a_request(request_queue_t * q)
 					abort_read();
 					if (!sony_toc_read) {
 						printk("CDU31A: TOC not read\n");
-						end_request(0);
+						end_request(CURRENT, 0);
 						goto cdu31a_request_startover;
 					}
 					if (start_request
 					    (block / 4, CDU31A_READAHEAD / 4, 0)) {
 						printk
 							("CDU31a: start request failed\n");
-						end_request(0);
+						end_request(CURRENT, 0);
 						goto cdu31a_request_startover;
 					}
 				}
@@ -1679,7 +1679,7 @@ static void do_cdu31a_request(request_queue_t * q)
 						res_reg, &res_size);
 				if (res_reg[0] == 0x20) {
 					if (num_retries > MAX_CDU31A_RETRIES) {
-						end_request(0);
+						end_request(CURRENT, 0);
 						goto cdu31a_request_startover;
 					}
 
@@ -1696,12 +1696,12 @@ static void do_cdu31a_request(request_queue_t * q)
 					}
 					goto try_read_again;
 				} else {
-					end_request(1);
+					end_request(CURRENT, 1);
 				}
 				break;
 
 			case WRITE:
-				end_request(0);
+				end_request(CURRENT, 0);
 				break;
 
 			default:
diff --git a/drivers/cdrom/cm206.c b/drivers/cdrom/cm206.c
index 8d4935a831f6..2b9cf52239d9 100644
--- a/drivers/cdrom/cm206.c
+++ b/drivers/cdrom/cm206.c
@@ -864,7 +864,7 @@ static void do_cm206_request(request_queue_t * q)
 		if (CURRENT->cmd != READ) {
 			debug(("Non-read command %d on cdrom\n",
 			       CURRENT->cmd));
-			end_request(0);
+			end_request(CURRENT, 0);
 			continue;
 		}
 		spin_unlock_irq(q->queue_lock);
@@ -895,7 +895,7 @@ static void do_cm206_request(request_queue_t * q)
 			}
 		}
 		spin_lock_irq(q->queue_lock);
-		end_request(!error);
+		end_request(CURRENT, !error);
 	}
 }
 
diff --git a/drivers/cdrom/gscd.c b/drivers/cdrom/gscd.c
index 4de884482684..dcca0b08c176 100644
--- a/drivers/cdrom/gscd.c
+++ b/drivers/cdrom/gscd.c
@@ -292,13 +292,13 @@ static void __do_gscd_request(unsigned long dummy)
 
 	if (CURRENT->cmd != READ) {
 		printk("GSCD: bad cmd %p\n", CURRENT->cmd);
-		end_request(0);
+		end_request(CURRENT, 0);
 		goto repeat;
 	}
 
 	if (dev != 0) {
 		printk("GSCD: this version supports only one device\n");
-		end_request(0);
+		end_request(CURRENT, 0);
 		goto repeat;
 	}
 
@@ -307,7 +307,7 @@ static void __do_gscd_request(unsigned long dummy)
 	/* if we satisfied the request from the buffer, we're done. */
 
 	if (CURRENT->nr_sectors == 0) {
-		end_request(1);
+		end_request(CURRENT, 1);
 		goto repeat;
 	}
 #ifdef GSCD_DEBUG
@@ -337,11 +337,11 @@ static void gscd_read_cmd(void)
 	cmd_status();
 	if (disk_state & (ST_NO_DISK | ST_DOOR_OPEN)) {
 		printk("GSCD: no disk or door open\n");
-		end_request(0);
+		end_request(CURRENT, 0);
 	} else {
 		if (disk_state & ST_INVALID) {
 			printk("GSCD: disk invalid\n");
-			end_request(0);
+			end_request(CURRENT, 0);
 		} else {
 			gscd_bn = -1;	/* purge our buffer */
 			block = CURRENT->sector / 4;
@@ -360,7 +360,7 @@ static void gscd_read_cmd(void)
 
 			gscd_bn = CURRENT->sector / 4;
 			gscd_transfer();
-			end_request(1);
+			end_request(CURRENT, 1);
 		}
 	}
 	SET_TIMER(__do_gscd_request, 1);
diff --git a/drivers/cdrom/mcd.c b/drivers/cdrom/mcd.c
index 3e4e2936138c..fd5d2ef6ccf3 100644
--- a/drivers/cdrom/mcd.c
+++ b/drivers/cdrom/mcd.c
@@ -622,14 +622,14 @@ static void do_mcd_request(request_queue_t * q)
 	while (current_valid()) {
 		mcd_transfer();
 		if (CURRENT->nr_sectors == 0) {
-			end_request(1);
+			end_request(CURRENT, 1);
 		} else {
 			mcd_buf_out = -1;	/* Want to read a block not in buffer */
 			if (mcd_state == MCD_S_IDLE) {
 				if (!tocUpToDate) {
 					if (updateToc() < 0) {
 						while (current_valid())
-							end_request(0);
+							end_request(CURRENT, 0);
 						break;
 					}
 				}
@@ -694,7 +694,7 @@ static void mcd_poll(unsigned long dummy)
 					goto ret;
 				}
 				if (current_valid())
-					end_request(0);
+					end_request(CURRENT, 0);
 				McdTries = MCD_RETRY_ATTEMPTS;
 			}
 		}
@@ -751,7 +751,7 @@ set_mode_immediately:
 				       "mcd: disk removed\n");
 				mcd_state = MCD_S_IDLE;
 				while (current_valid())
-					end_request(0);
+					end_request(CURRENT, 0);
 				goto out;
 			}
 			outb(MCMD_SET_MODE, MCDPORT(0));
@@ -785,7 +785,7 @@ read_immediately:
 				       "mcd: disk removed\n");
 				mcd_state = MCD_S_IDLE;
 				while (current_valid())
-					end_request(0);
+					end_request(CURRENT, 0);
 				goto out;
 			}
 
@@ -826,7 +826,7 @@ data_immediately:
 					break;
 				}
 				if (current_valid())
-					end_request(0);
+					end_request(CURRENT, 0);
 				McdTries = 5;
 			}
 			mcd_state = MCD_S_START;
@@ -853,7 +853,7 @@ data_immediately:
 				while (current_valid()) {
 					mcd_transfer();
 					if (CURRENT->nr_sectors == 0)
-						end_request(1);
+						end_request(CURRENT, 1);
 					else
 						break;
 				}
diff --git a/drivers/cdrom/mcdx.c b/drivers/cdrom/mcdx.c
index eac224169cdd..5a782d5f19c7 100644
--- a/drivers/cdrom/mcdx.c
+++ b/drivers/cdrom/mcdx.c
@@ -575,14 +575,14 @@ void do_mcdx_request(request_queue_t * q)
 		xwarn("do_request(): bad device: %s\n",
 		      kdevname(CURRENT->rq_dev));
 		xtrace(REQUEST, "end_request(0): bad device\n");
-		end_request(0);
+		end_request(CURRENT, 0);
 		return;
 	}
 
 	if (stuffp->audio) {
 		xwarn("do_request() attempt to read from audio cd\n");
 		xtrace(REQUEST, "end_request(0): read from audio\n");
-		end_request(0);
+		end_request(CURRENT, 0);
 		return;
 	}
 
@@ -592,7 +592,7 @@ void do_mcdx_request(request_queue_t * q)
 	if (CURRENT->cmd != READ) {
 		xwarn("do_request(): non-read command to cd!!\n");
 		xtrace(REQUEST, "end_request(0): write\n");
-		end_request(0);
+		end_request(CURRENT, 0);
 		return;
 	}
 	else {
@@ -606,18 +606,18 @@ void do_mcdx_request(request_queue_t * q)
 					  CURRENT->nr_sectors);
 
 			if (i == -1) {
-				end_request(0);
+				end_request(CURRENT, 0);
 				goto again;
 			}
 			CURRENT->sector += i;
 			CURRENT->nr_sectors -= i;
 			CURRENT->buffer += (i * 512);
 		}
-		end_request(1);
+		end_request(CURRENT, 1);
 		goto again;
 
 		xtrace(REQUEST, "end_request(1)\n");
-		end_request(1);
+		end_request(CURRENT, 1);
 	}
 
 	goto again;
diff --git a/drivers/cdrom/optcd.c b/drivers/cdrom/optcd.c
index 0b2c76fed1fc..da3a907dc7d9 100644
--- a/drivers/cdrom/optcd.c
+++ b/drivers/cdrom/optcd.c
@@ -1096,7 +1096,7 @@ static void poll(unsigned long data)
 			if (transfer_is_active)
 				loop_again = 0;
 			if (current_valid())
-				end_request(0);
+				end_request(CURRENT, 0);
 			tries = 5;
 		}
 		error = 0;
@@ -1130,7 +1130,7 @@ static void poll(unsigned long data)
 			if (send_cmd(COMDRVST)) {
 				state = S_IDLE;
 				while (current_valid())
-					end_request(0);
+					end_request(CURRENT, 0);
 				return;
 			}
 			state = S_READ;
@@ -1157,7 +1157,7 @@ static void poll(unsigned long data)
 					: "disk removed");
 				state = S_IDLE;
 				while (current_valid())
-					end_request(0);
+					end_request(CURRENT, 0);
 				return;
 			}
 			if (!current_valid()) {
@@ -1212,7 +1212,7 @@ static void poll(unsigned long data)
 						break;
 					}
 					if (current_valid())
-						end_request(0);
+						end_request(CURRENT, 0);
 					tries = 5;
 				}
 				state = S_START;
@@ -1248,7 +1248,7 @@ static void poll(unsigned long data)
 						read_count = 0;
 						state = S_STOP;
 						loop_again = 1;
-						end_request(0);
+						end_request(CURRENT, 0);
 						break;
 					}
 					fetch_data(buf+
@@ -1278,7 +1278,7 @@ static void poll(unsigned long data)
 					while (current_valid()) {
 						transfer();
 						if (CURRENT -> nr_sectors == 0)
-							end_request(1);
+							end_request(CURRENT, 1);
 						else
 							break;
 					}
@@ -1309,7 +1309,7 @@ static void poll(unsigned long data)
 			if (send_cmd(COMDRVST)) {
 				state = S_IDLE;
 				while (current_valid())
-					end_request(0);
+					end_request(CURRENT, 0);
 				return;
 			}
 			state = S_STOPPING;
@@ -1350,7 +1350,7 @@ static void poll(unsigned long data)
 		if (exec_cmd(COMSTOP) < 0) {
 			state = S_IDLE;
 			while (current_valid())
-				end_request(0);
+				end_request(CURRENT, 0);
 			return;
 		}
 	}
@@ -1366,7 +1366,7 @@ static void do_optcd_request(request_queue_t * q)
 
 	if (disk_info.audio) {
 		printk(KERN_WARNING "optcd: tried to mount an Audio CD\n");
-		end_request(0);
+		end_request(CURRENT, 0);
 		return;
 	}
 
@@ -1374,14 +1374,14 @@ static void do_optcd_request(request_queue_t * q)
 	while (current_valid()) {
 		transfer();	/* First try to transfer block from buffers */
 		if (CURRENT -> nr_sectors == 0) {
-			end_request(1);
+			end_request(CURRENT, 1);
 		} else {	/* Want to read a block not in buffer */
 			buf_out = NOBUF;
 			if (state == S_IDLE) {
 				/* %% Should this block the request queue?? */
 				if (update_toc() < 0) {
 					while (current_valid())
-						end_request(0);
+						end_request(CURRENT, 0);
 					break;
 				}
 				/* Start state machine */
diff --git a/drivers/cdrom/sbpcd.c b/drivers/cdrom/sbpcd.c
index bf8a8a47e307..937c5f444828 100644
--- a/drivers/cdrom/sbpcd.c
+++ b/drivers/cdrom/sbpcd.c
@@ -4864,7 +4864,7 @@ static void do_sbpcd_request(request_queue_t * q)
 	blkdev_dequeue_request(req);	/* task can fuck it up         GTL  */
 
 	if (req -> sector == -1)
-		end_request(0);
+		end_request(CURRENT, 0);
 	spin_unlock_irq(q->queue_lock);
 
 	down(&ioctl_read_sem);
@@ -4906,7 +4906,7 @@ static void do_sbpcd_request(request_queue_t * q)
 #endif
 		up(&ioctl_read_sem);
 		spin_lock_irq(q->queue_lock);
-		end_request(1);
+		end_request(CURRENT, 1);
 		goto request_loop;
 	}
 
@@ -4947,7 +4947,7 @@ static void do_sbpcd_request(request_queue_t * q)
 #endif
 			up(&ioctl_read_sem);
 			spin_lock_irq(q->queue_lock);
-			end_request(1);
+			end_request(CURRENT, 1);
 			goto request_loop;
 		}
 	}
@@ -4963,7 +4963,7 @@ static void do_sbpcd_request(request_queue_t * q)
 	up(&ioctl_read_sem);
 	sbp_sleep(0);    /* wait a bit, try again */
 	spin_lock_irq(q->queue_lock);
-	end_request(0);
+	end_request(CURRENT, 0);
 	goto request_loop;
 }
 /*==========================================================================*/
diff --git a/drivers/cdrom/sjcd.c b/drivers/cdrom/sjcd.c
index 80a4719fdbdb..544af743969b 100644
--- a/drivers/cdrom/sjcd.c
+++ b/drivers/cdrom/sjcd.c
@@ -1304,7 +1304,7 @@ static void sjcd_poll(void)
 					     sjcd_next_bn);
 #endif
 					if (current_valid())
-						end_request(0);
+						end_request(CURRENT, 0);
 #if defined( SJCD_TRACE )
 					printk
 					    ("SJCD_S_DATA: pre-cmd failed: go to SJCD_S_STOP mode\n");
@@ -1378,7 +1378,7 @@ static void sjcd_poll(void)
 							    nr_sectors ==
 							    0)
 								end_request
-								    (1);
+								    (CURRENT, 1);
 							else
 								break;
 						}
@@ -1473,7 +1473,7 @@ static void sjcd_poll(void)
 	if (--sjcd_transfer_timeout == 0) {
 		printk("SJCD: timeout in state %d\n", sjcd_transfer_state);
 		while (current_valid())
-			end_request(0);
+			end_request(CURRENT, 0);
 		sjcd_send_cmd(SCMD_STOP);
 		sjcd_transfer_state = SJCD_S_IDLE;
 		goto ReSwitch;
@@ -1496,7 +1496,7 @@ static void do_sjcd_request(request_queue_t * q)
 	while (current_valid()) {
 		sjcd_transfer();
 		if (CURRENT->nr_sectors == 0)
-			end_request(1);
+			end_request(CURRENT, 1);
 		else {
 			sjcd_buf_out = -1;	/* Want to read a block not in buffer */
 			if (sjcd_transfer_state == SJCD_S_IDLE) {
@@ -1505,7 +1505,7 @@ static void do_sjcd_request(request_queue_t * q)
 						printk
 						    ("SJCD: transfer: discard\n");
 						while (current_valid())
-							end_request(0);
+							end_request(CURRENT, 0);
 						break;
 					}
 				}
diff --git a/drivers/cdrom/sonycd535.c b/drivers/cdrom/sonycd535.c
index 4d1f7af34c72..a4c527efdf75 100644
--- a/drivers/cdrom/sonycd535.c
+++ b/drivers/cdrom/sonycd535.c
@@ -818,7 +818,7 @@ do_cdu535_request(request_queue_t * q)
 		block = CURRENT->sector;
 		nsect = CURRENT->nr_sectors;
 		if (dev != 0) {
-			end_request(0);
+			end_request(CURRENT, 0);
 			continue;
 		}
 		if(CURRENT->flags & REQ_CMD) {
@@ -830,11 +830,11 @@ do_cdu535_request(request_queue_t * q)
 				 */
 				
 				if (sony_toc->lead_out_start_lba <= (block / 4)) {
-					end_request(0);
+					end_request(CURRENT, 0);
 					return;
 				}
 				if (sony_toc->lead_out_start_lba <= ((block + nsect) / 4)) {
-					end_request(0);
+					end_request(CURRENT, 0);
 					return;
 				}
 				while (0 < nsect) {
@@ -896,7 +896,7 @@ do_cdu535_request(request_queue_t * q)
 									       status[0]);
 								sony_first_block = -1;
 								sony_last_block = -1;
-								end_request(0);
+								end_request(CURRENT, 0);
 								return;
 							}
 							if (readStatus == BAD_STATUS) {
@@ -925,11 +925,11 @@ do_cdu535_request(request_queue_t * q)
 					CURRENT->buffer += 512;
 				}
 
-				end_request(1);
+				end_request(CURRENT, 1);
 				break;
 				
 			case WRITE:
-				end_request(0);
+				end_request(CURRENT, 0);
 				break;
 				
 			default: