diff options
| author | Kiyoshi Ueda <k-ueda@ct.jp.nec.com> | 2007-12-11 17:43:15 -0500 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2008-01-28 10:36:04 +0100 |
| commit | 0156c2547e92df559d5592aad9535838ef459615 (patch) | |
| tree | 53cced8f24d7a68b576e4854735c9c7df9bd299c /drivers | |
| parent | 4898b53a5e3e4b9a58f1d89545b1e05c88c76798 (diff) | |
| download | op-kernel-dev-0156c2547e92df559d5592aad9535838ef459615.zip op-kernel-dev-0156c2547e92df559d5592aad9535838ef459615.tar.gz | |
blk_end_request: changing DAC960 (take 4)
This patch converts DAC960 to use blk_end_request interfaces.
Related 'UpToDate' arguments are converted to 'Error'.
Signed-off-by: Kiyoshi Ueda <k-ueda@ct.jp.nec.com>
Signed-off-by: Jun'ichi Nomura <j-nomura@ce.jp.nec.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/block/DAC960.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c index 9030c37..cd03473 100644 --- a/drivers/block/DAC960.c +++ b/drivers/block/DAC960.c @@ -3455,19 +3455,12 @@ static inline bool DAC960_ProcessCompletedRequest(DAC960_Command_T *Command, bool SuccessfulIO) { struct request *Request = Command->Request; - int UpToDate; - - UpToDate = 0; - if (SuccessfulIO) - UpToDate = 1; + int Error = SuccessfulIO ? 0 : -EIO; pci_unmap_sg(Command->Controller->PCIDevice, Command->cmd_sglist, Command->SegmentCount, Command->DmaDirection); - if (!end_that_request_first(Request, UpToDate, Command->BlockCount)) { - add_disk_randomness(Request->rq_disk); - end_that_request_last(Request, UpToDate); - + if (!__blk_end_request(Request, Error, Command->BlockCount << 9)) { if (Command->Completion) { complete(Command->Completion); Command->Completion = NULL; |
