login
Header Space

 
 

[PATCH 06/30] blk_end_request: changing DAC960 (take 4)

Previous thread: [PATCH 05/30] blk_end_request: changing um (take 4) by Kiyoshi Ueda on Tuesday, December 11, 2007 - 6:42 pm. (2 messages)

Next thread: [PATCH 08/30] blk_end_request: changing nbd (take 4) by Kiyoshi Ueda on Tuesday, December 11, 2007 - 6:44 pm. (1 message)
To: <jens.axboe@...>
Cc: <linux-kernel@...>, <linux-scsi@...>, <linux-ide@...>, <dm-devel@...>, <j-nomura@...>, <k-ueda@...>
Date: Tuesday, December 11, 2007 - 6:43 pm

This patch converts DAC960 to use blk_end_request interfaces.
Related 'UpToDate' arguments are converted to 'Error'.

Signed-off-by: Kiyoshi Ueda &lt;k-ueda@ct.jp.nec.com&gt;
Signed-off-by: Jun'ichi Nomura &lt;j-nomura@ce.jp.nec.com&gt;
---
 drivers/block/DAC960.c |   11 ++---------
 1 files changed, 2 insertions(+), 9 deletions(-)

Index: 2.6.24-rc4/drivers/block/DAC960.c
===================================================================
--- 2.6.24-rc4.orig/drivers/block/DAC960.c
+++ 2.6.24-rc4/drivers/block/DAC960.c
@@ -3455,19 +3455,12 @@ static inline bool DAC960_ProcessComplet
 						 bool SuccessfulIO)
 {
 	struct request *Request = Command-&gt;Request;
-	int UpToDate;
-
-	UpToDate = 0;
-	if (SuccessfulIO)
-		UpToDate = 1;
+	int Error = SuccessfulIO ? 0 : -EIO;
 
 	pci_unmap_sg(Command-&gt;Controller-&gt;PCIDevice, Command-&gt;cmd_sglist,
 		Command-&gt;SegmentCount, Command-&gt;DmaDirection);
 
-	 if (!end_that_request_first(Request, UpToDate, Command-&gt;BlockCount)) {
-		add_disk_randomness(Request-&gt;rq_disk);
- 	 	end_that_request_last(Request, UpToDate);
-
+	 if (!__blk_end_request(Request, Error, Command-&gt;BlockCount &lt;&lt; 9)) {
 		if (Command-&gt;Completion) {
 			complete(Command-&gt;Completion);
 			Command-&gt;Completion = NULL;
--
Previous thread: [PATCH 05/30] blk_end_request: changing um (take 4) by Kiyoshi Ueda on Tuesday, December 11, 2007 - 6:42 pm. (2 messages)

Next thread: [PATCH 08/30] blk_end_request: changing nbd (take 4) by Kiyoshi Ueda on Tuesday, December 11, 2007 - 6:44 pm. (1 message)
speck-geostationary