From 7148b02cabbb86ac0885877df2c8142370d8bdc9 Mon Sep 17 00:00:00 2001
From: Jens Axboe <jens.axboe@oracle.com>
Date: Fri, 31 Oct 2008 10:06:37 +0100
Subject: [PATCH] --- yaml --- r: 123299 b: refs/heads/master c:
 31dcfab0ae6eb0340d456931df4d478e17efc65d h: refs/heads/master i:   123297:
 aad63cc286fbf350fd07d7ed1f96e7f98d767768   123295:
 0e492853e9a2fb67f0ccec606dd832c1d79dcaa0 v: v3

---
 [refs]                    |  2 +-
 trunk/drivers/block/nbd.c | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 81034ba9ebd0..91ae9a0882c0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b374d18a4bfce705e4a99ae9f501b53e86ecb283
+refs/heads/master: 31dcfab0ae6eb0340d456931df4d478e17efc65d
diff --git a/trunk/drivers/block/nbd.c b/trunk/drivers/block/nbd.c
index 0766ce6187a9..7bcc1d8bc967 100644
--- a/trunk/drivers/block/nbd.c
+++ b/trunk/drivers/block/nbd.c
@@ -722,7 +722,6 @@ static int __init nbd_init(void)
 
 	for (i = 0; i < nbds_max; i++) {
 		struct gendisk *disk = alloc_disk(1 << part_shift);
-		struct elevator_queue *old_e;
 		if (!disk)
 			goto out;
 		nbd_dev[i].disk = disk;
@@ -736,11 +735,10 @@ 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);
-		}
+		/*
+		 * Tell the block layer that we are not a rotational device
+		 */
+		queue_flag_set_unlocked(QUEUE_FLAG_NONROT, disk->queue);
 	}
 
 	if (register_blkdev(NBD_MAJOR, "nbd")) {