projects
/
platform
/
kernel
/
linux-3.10.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4c4e214
)
blk_end_request: changing ide-scsi (take 4)
author
Kiyoshi Ueda
<k-ueda@ct.jp.nec.com>
Tue, 11 Dec 2007 22:49:29 +0000
(17:49 -0500)
committer
Jens Axboe
<jens.axboe@oracle.com>
Mon, 28 Jan 2008 09:36:56 +0000
(10:36 +0100)
This patch converts ide-scsi to use blk_end_request interfaces.
Related 'uptodate' arguments are converted to 'error'.
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
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>
drivers/scsi/ide-scsi.c
patch
|
blob
|
history
diff --git
a/drivers/scsi/ide-scsi.c
b/drivers/scsi/ide-scsi.c
index
02e9189
..
db8bc20
100644
(file)
--- a/
drivers/scsi/ide-scsi.c
+++ b/
drivers/scsi/ide-scsi.c
@@
-919,8
+919,8
@@
static int idescsi_eh_reset (struct scsi_cmnd *cmd)
}
/* kill current request */
- blkdev_dequeue_request(req);
-
end_that_request_last(req, 0
);
+ if (__blk_end_request(req, -EIO, 0))
+
BUG(
);
if (blk_sense_request(req))
kfree(scsi->pc->buffer);
kfree(scsi->pc);
@@
-929,8
+929,8
@@
static int idescsi_eh_reset (struct scsi_cmnd *cmd)
/* now nuke the drive queue */
while ((req = elv_next_request(drive->queue))) {
- blkdev_dequeue_request(req);
-
end_that_request_last(req, 0
);
+ if (__blk_end_request(req, -EIO, 0))
+
BUG(
);
}
HWGROUP(drive)->rq = NULL;