Skip to contentSkip to conversation

ide: use __generic_unplug_device() in ide_do_drive_cmd()

PATCH In review Bartlomiej Zolnierkiewicz 1 participant 1 message May 3, 2008 libata

lore
Share & tools
lore

Bartlomiej Zolnierkiewicz

author
#0 lore raw

PATCH 3/3 ide: use __generic_unplug_device() in ide_do_drive_cmd()

Call __elv_add_request() with 'plug' == 1 (so the device will be plugged) and then use __generic_unplug_device() instead of calling ide_do_request() directly.

This is a preparation for converting IDE to use blk_execute_rq().

Cc FUJITA Tomonori <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc Jens Axboe <[email protected]>
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>

---
while the change should be OK it is really better to handle it before the real conversion

 drivers/ide/ide-io.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/ide/ide-io.c +2 -2
Index: b/drivers/ide/ide-io.c
===================================================================
@@ -1608,8 +1608,8 @@ int ide_do_drive_cmd (ide_drive_t *drive
 	spin_lock_irqsave(&ide_lock, flags);
 	if (action == ide_preempt)
 		hwgroup->rq = NULL;
-	__elv_add_request(drive->queue, rq, where, 0);
-	ide_do_request(hwgroup, IDE_NO_IRQ);
+	__elv_add_request(drive->queue, rq, where, 1);
+	__generic_unplug_device(drive->queue);
 	spin_unlock_irqrestore(&ide_lock, flags);
 
 	err = 0;