Commit 31dcfab0 authored by Jens Axboe's avatar Jens Axboe

nbd: tell the block layer that it is not a rotational device

Then we can get rid of that manual elevator type fiddling.
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent b374d18a
...@@ -722,7 +722,6 @@ static int __init nbd_init(void) ...@@ -722,7 +722,6 @@ static int __init nbd_init(void)
for (i = 0; i < nbds_max; i++) { for (i = 0; i < nbds_max; i++) {
struct gendisk *disk = alloc_disk(1 << part_shift); struct gendisk *disk = alloc_disk(1 << part_shift);
struct elevator_queue *old_e;
if (!disk) if (!disk)
goto out; goto out;
nbd_dev[i].disk = disk; nbd_dev[i].disk = disk;
...@@ -736,11 +735,10 @@ static int __init nbd_init(void) ...@@ -736,11 +735,10 @@ static int __init nbd_init(void)
put_disk(disk); put_disk(disk);
goto out; goto out;
} }
old_e = disk->queue->elevator; /*
if (elevator_init(disk->queue, "deadline") == 0 || * Tell the block layer that we are not a rotational device
elevator_init(disk->queue, "noop") == 0) { */
elevator_exit(old_e); queue_flag_set_unlocked(QUEUE_FLAG_NONROT, disk->queue);
}
} }
if (register_blkdev(NBD_MAJOR, "nbd")) { if (register_blkdev(NBD_MAJOR, "nbd")) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment