Skip to content

Commit

Permalink
block: switch s390 tape_block and mg_disk to elevator_change()
Browse files Browse the repository at this point in the history
Now that we have this API, switch the two in-kernel users to it.
Resolves an oops introduced by commit
1abec4f.

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
  • Loading branch information
Jens Axboe committed Aug 23, 2010
1 parent 5dd531a commit 52cc2ee
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
3 changes: 1 addition & 2 deletions drivers/block/mg_disk.c
Original file line number Diff line number Diff line change
Expand Up @@ -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__);
Expand Down
3 changes: 1 addition & 2 deletions drivers/s390/char/tape_block.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 52cc2ee

Please sign in to comment.