[PATCH][2.6.0-test3] fix ide-scsi for ide_drive_t->queue change

From: Mikael Pettersson
Date: Sat Aug 09 2003 - 07:00:50 EST


This patch fixes ide-scsi.c for the ide_drive_t->queue type change
in 2.6.0-test3.

Without the patch you'll get these new warnings in -test3:

drivers/scsi/ide-scsi.c: In function `idescsi_abort':
drivers/scsi/ide-scsi.c:875: warning: passing arg 1 of `elv_queue_empty' from incompatible pointer type
drivers/scsi/ide-scsi.c: In function `idescsi_reset':
drivers/scsi/ide-scsi.c:902: warning: passing arg 1 of `elv_next_request' from incompatible pointer type

/Mikael

diff -ruN linux-2.6.0-test3/drivers/scsi/ide-scsi.c linux-2.6.0-test3.ide-scsi-fixes-2.6.0-test3/drivers/scsi/ide-scsi.c
--- linux-2.6.0-test3/drivers/scsi/ide-scsi.c 2003-07-28 01:24:44.000000000 +0200
+++ linux-2.6.0-test3.ide-scsi-fixes-2.6.0-test3/drivers/scsi/ide-scsi.c 2003-08-09 12:58:38.000000000 +0200
@@ -872,7 +872,7 @@
continue;
}
/* no, but is it queued in the ide subsystem? */
- if (elv_queue_empty(&drive->queue)) {
+ if (elv_queue_empty(drive->queue)) {
spin_unlock_irqrestore(&ide_lock, flags);
return SUCCESS;
}
@@ -899,7 +899,7 @@
schedule_timeout(1);
}
/* now nuke the drive queue */
- while ((req = elv_next_request(&drive->queue))) {
+ while ((req = elv_next_request(drive->queue))) {
blkdev_dequeue_request(req);
end_that_request_last(req);
}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/