diff options
| author | Jens Axboe <jaxboe@fusionio.com> | 2011-03-10 08:58:35 +0100 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2011-03-10 08:58:35 +0100 |
| commit | 4c63f5646e405b5010cc9499419060bf2e838f5b (patch) | |
| tree | df91ba315032c8ec4aafeb3ab96fdfa7c6c656e1 /drivers/block/pktcdvd.c | |
| parent | staging: Convert to bdops->check_events() (diff) | |
| parent | blk-throttle: Use blk_plug in throttle dispatch (diff) | |
| download | linux-4c63f5646e405b5010cc9499419060bf2e838f5b.tar.xz linux-4c63f5646e405b5010cc9499419060bf2e838f5b.zip | |
Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/core
Conflicts:
block/blk-core.c
block/blk-flush.c
drivers/md/raid1.c
drivers/md/raid10.c
drivers/md/raid5.c
fs/nilfs2/btnode.c
fs/nilfs2/mdt.c
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'drivers/block/pktcdvd.c')
| -rw-r--r-- | drivers/block/pktcdvd.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c index a077db27b7c9..07a382eaf0a8 100644 --- a/drivers/block/pktcdvd.c +++ b/drivers/block/pktcdvd.c @@ -1606,8 +1606,6 @@ static int kcdrwd(void *foobar) min_sleep_time = pkt->sleep_time; } - generic_unplug_device(bdev_get_queue(pd->bdev)); - VPRINTK("kcdrwd: sleeping\n"); residue = schedule_timeout(min_sleep_time); VPRINTK("kcdrwd: wake up\n"); |