[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20070911.150319.91214042.k-ueda@ct.jp.nec.com>
Date: Tue, 11 Sep 2007 15:03:19 -0400 (EDT)
From: Kiyoshi Ueda <k-ueda@...jp.nec.com>
To: jens.axboe@...cle.com, linux-kernel@...r.kernel.org,
linux-scsi@...r.kernel.org, linux-ide@...r.kernel.org,
mike.miller@...com, grant.likely@...retlab.ca
Cc: dm-devel@...hat.com, j-nomura@...jp.nec.com, k-ueda@...jp.nec.com
Subject: [PATCH 21/27] blk_end_request: changing ide-scsi (take 2)
This patch converts ide-scsi to use blk_end_request().
Signed-off-by: Kiyoshi Ueda <k-ueda@...jp.nec.com>
Signed-off-by: Jun'ichi Nomura <j-nomura@...jp.nec.com>
---
drivers/scsi/ide-scsi.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff -rupN 20-scsi-mid-caller-change/drivers/scsi/ide-scsi.c 21-ide-scsi-caller-change/drivers/scsi/ide-scsi.c
--- 20-scsi-mid-caller-change/drivers/scsi/ide-scsi.c 2007-09-10 17:32:15.000000000 -0400
+++ 21-ide-scsi-caller-change/drivers/scsi/ide-scsi.c 2007-09-10 18:13:51.000000000 -0400
@@ -1042,8 +1042,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, 0, 0))
+ BUG();
if (blk_sense_request(req))
kfree(scsi->pc->buffer);
kfree(scsi->pc);
@@ -1052,8 +1052,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, 0, 0))
+ BUG();
}
HWGROUP(drive)->rq = NULL;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists