From 1bede72ed8170861f619f369440ac5a4944cc6ba Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Mon, 23 Aug 2010 14:02:44 +0200 Subject: [PATCH] --- yaml --- r: 210523 b: refs/heads/master c: 52cc2eef31587b22ce9fbe77b064a031a9613ab0 h: refs/heads/master i: 210521: f90776280de62e6e115237365905bba0e37215be 210519: c4e40779523ab3f2e92890bc58851c71240995a8 v: v3 --- [refs] | 2 +- trunk/drivers/block/mg_disk.c | 3 +-- trunk/drivers/s390/char/tape_block.c | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 70922c4efc43..4ecaf9c2e1b0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5dd531a03ad721b41911ddb32e6e0481404e7aaf +refs/heads/master: 52cc2eef31587b22ce9fbe77b064a031a9613ab0 diff --git a/trunk/drivers/block/mg_disk.c b/trunk/drivers/block/mg_disk.c index b82c5ce5e9df..76fa3deaee84 100644 --- a/trunk/drivers/block/mg_disk.c +++ b/trunk/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/trunk/drivers/s390/char/tape_block.c b/trunk/drivers/s390/char/tape_block.c index b7de02525ec9..85cf607fc78f 100644 --- a/trunk/drivers/s390/char/tape_block.c +++ b/trunk/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;