1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 018753c59b8e..b53fdb0a282c 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -655,6 +655,7 @@ static int __init nbd_init(void)
 
         for (i = 0; i < nbds_max; i++) {
                 struct gendisk *disk = alloc_disk(1);
+                elevator_t *old_e;
                 if (!disk)
                         goto out;
                 nbd_dev[i].disk = disk;
@@ -668,6 +669,11 @@ static int __init nbd_init(void)
                         put_disk(disk);
                         goto out;
                 }
+                old_e = disk->queue->elevator;
+                if (elevator_init(disk->queue, "deadline") == 0 ||
+                        elevator_init(disk->queue, "noop") == 0) {
+                                elevator_exit(old_e);
+                }
         }
 
         if (register_blkdev(NBD_MAJOR, "nbd")) {