mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-30 08:02:30 +00:00
Code Issues Releases Wiki Activity

ide-cd: convert to blk_delay_queue() for a short pause

Browse source 
It was always abuse to reuse the plugging infrastructure for this,
convert it to the (new) real API for delaying queueing a bit.

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Acked-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jens Axboe 2010-04-16 21:11:21 +02:00
parent 3cca6dc1c8
commit 0a41e90bb7
1 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/ide/ide-cd.c
View file

@ -258,17 +258,10 @@ static int ide_cd_breathe(ide_drive_t *drive, struct request *rq)
if (time_after(jiffies, info->write_timeout)) if (time_after(jiffies, info->write_timeout))
return 0; return 0;
else { else {
struct request_queue *q = drive->queue;
unsigned long flags;
/* /*
* take a breather relying on the unplug timer to kick us again * take a breather
*/ */
blk_delay_queue(drive->queue, 1);
spin_lock_irqsave(q->queue_lock, flags);
blk_plug_device(q);
spin_unlock_irqrestore(q->queue_lock, flags);
return 1; return 1;
} }
} }
@ -1514,8 +1507,6 @@ static int ide_cdrom_setup(ide_drive_t *drive)
blk_queue_dma_alignment(q, 31); blk_queue_dma_alignment(q, 31);
blk_queue_update_dma_pad(q, 15); blk_queue_update_dma_pad(q, 15);
q->unplug_delay = max((1 * HZ) / 1000, 1);
drive->dev_flags |= IDE_DFLAG_MEDIA_CHANGED; drive->dev_flags |= IDE_DFLAG_MEDIA_CHANGED;
drive->atapi_flags = IDE_AFLAG_NO_EJECT | ide_cd_flags(id); drive->atapi_flags = IDE_AFLAG_NO_EJECT | ide_cd_flags(id);