Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-01-01 07:42:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

block: switch s390 tape_block and mg_disk to elevator_change()

Browse Source 
Now that we have this API, switch the two in-kernel users to it.
Resolves an oops introduced by commit
1abec4fdbb.

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
This commit is contained in:
Jens Axboe 2010-08-23 14:02:44 +02:00
parent 5dd531a03a
commit 52cc2eef31
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/block/mg_disk.c
View File

@ -974,8 +974,7 @@ static int mg_probe(struct platform_device *plat_dev)
host->breq->queuedata = host; host->breq->queuedata = host;
/* mflash is random device, thanx for the noop */ /* mflash is random device, thanx for the noop */
elevator_exit(host->breq->elevator); err = elevator_change(host->breq, "noop");
err = elevator_init(host->breq, "noop");
if (err) { if (err) {
printk(KERN_ERR "%s:%d (elevator_init) fail\n", printk(KERN_ERR "%s:%d (elevator_init) fail\n",
__func__, __LINE__); __func__, __LINE__);

3
drivers/s390/char/tape_block.c
View File

@ -217,8 +217,7 @@ tapeblock_setup_device(struct tape_device * device)
if (!blkdat->request_queue) if (!blkdat->request_queue)
return -ENOMEM; return -ENOMEM;
elevator_exit(blkdat->request_queue->elevator); rc = elevator_change(blkdat->request_queue, "noop");
rc = elevator_init(blkdat->request_queue, "noop");
if (rc) if (rc)
goto cleanup_queue; goto cleanup_queue;