2007-12-11 22:50:58

by Kiyoshi Ueda

Subject: [PATCH 19/30] blk_end_request: changing ide-scsi (take 4)

This patch converts ide-scsi to use blk_end_request interfaces.
Related 'uptodate' arguments are converted to 'error'.

Cc: Bartlomiej Zolnierkiewicz <[email protected]>
Signed-off-by: Kiyoshi Ueda <[email protected]>
Signed-off-by: Jun'ichi Nomura <[email protected]>
---
drivers/scsi/ide-scsi.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)

Index: 2.6.24-rc4/drivers/scsi/ide-scsi.c
===================================================================
--- 2.6.24-rc4.orig/drivers/scsi/ide-scsi.c
+++ 2.6.24-rc4/drivers/scsi/ide-scsi.c
@@ -921,8 +921,8 @@ static int idescsi_eh_reset (struct scsi
}

/* 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);
@@ -931,8 +931,8 @@ static int idescsi_eh_reset (struct scsi

/* 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;

2007-12-12 22:58:22

by Bartlomiej Zolnierkiewicz

Subject: Re: [PATCH 19/30] blk_end_request: changing ide-scsi (take 4)

On Tuesday 11 December 2007, Kiyoshi Ueda wrote:
> This patch converts ide-scsi to use blk_end_request interfaces.
> Related 'uptodate' arguments are converted to 'error'.
>
> Cc: Bartlomiej Zolnierkiewicz <[email protected]>
> Signed-off-by: Kiyoshi Ueda <[email protected]>
> Signed-off-by: Jun'ichi Nomura <[email protected]>

looks good, ACK

ditto for patches #23 and #25