diff options
| author | Jens Axboe <jaxboe@fusionio.com> | 2010-08-23 14:02:44 +0200 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2010-08-23 14:02:44 +0200 |
| commit | 52cc2eef31587b22ce9fbe77b064a031a9613ab0 (patch) | |
| tree | ae33f1efc3e39db2a16c4cdd78aa861a1e022d75 | |
| parent | 5dd531a03ad721b41911ddb32e6e0481404e7aaf (diff) | |
| download | linux-52cc2eef31587b22ce9fbe77b064a031a9613ab0.tar.gz linux-52cc2eef31587b22ce9fbe77b064a031a9613ab0.tar.bz2 linux-52cc2eef31587b22ce9fbe77b064a031a9613ab0.zip | |
block: switch s390 tape_block and mg_disk to elevator_change()
Now that we have this API, switch the two in-kernel users to it.
Resolves an oops introduced by commit
1abec4fdbb142e3ccb6ce99832fae42129134a96.
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
| -rw-r--r-- | drivers/block/mg_disk.c | 3 | ||||
| -rw-r--r-- | drivers/s390/char/tape_block.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/block/mg_disk.c b/drivers/block/mg_disk.c index b82c5ce5e9df..76fa3deaee84 100644 --- a/drivers/block/mg_disk.c +++ b/drivers/block/mg_disk.c @@ -974,8 +974,7 @@ static int mg_probe(struct platform_device *plat_dev) host->breq->queuedata = host; /* mflash is random device, thanx for the noop */ - elevator_exit(host->breq->elevator); - err = elevator_init(host->breq, "noop"); + err = elevator_change(host->breq, "noop"); if (err) { printk(KERN_ERR "%s:%d (elevator_init) fail\n", __func__, __LINE__); diff --git a/drivers/s390/char/tape_block.c b/drivers/s390/char/tape_block.c index b7de02525ec9..85cf607fc78f 100644 --- a/drivers/s390/char/tape_block.c +++ b/drivers/s390/char/tape_block.c @@ -217,8 +217,7 @@ tapeblock_setup_device(struct tape_device * device) if (!blkdat->request_queue) return -ENOMEM; - elevator_exit(blkdat->request_queue->elevator); - rc = elevator_init(blkdat->request_queue, "noop"); + rc = elevator_change(blkdat->request_queue, "noop"); if (rc) goto cleanup_queue; |