Commit 83415795 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

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

From: Mikael Pettersson <mikpe@csd.uu.se>

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
parent ae5a8df7
...@@ -872,7 +872,7 @@ static int idescsi_abort (Scsi_Cmnd *cmd) ...@@ -872,7 +872,7 @@ static int idescsi_abort (Scsi_Cmnd *cmd)
continue; continue;
} }
/* no, but is it queued in the ide subsystem? */ /* 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); spin_unlock_irqrestore(&ide_lock, flags);
return SUCCESS; return SUCCESS;
} }
...@@ -899,7 +899,7 @@ static int idescsi_reset (Scsi_Cmnd *cmd) ...@@ -899,7 +899,7 @@ static int idescsi_reset (Scsi_Cmnd *cmd)
schedule_timeout(1); schedule_timeout(1);
} }
/* now nuke the drive queue */ /* now nuke the drive queue */
while ((req = elv_next_request(&drive->queue))) { while ((req = elv_next_request(drive->queue))) {
blkdev_dequeue_request(req); blkdev_dequeue_request(req);
end_that_request_last(req); end_that_request_last(req);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment