cciss: shorten 30s timeout on controller reset

[linux-2.6-omap-h63xx.git] / drivers / block / xen-blkfront.c

diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index 2d19f0cc47f272c5ae4f96ee97ea34a1bce5a407..918ef725de41c849f3f78b7e30f80d7709e01a39 100644 (file)
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -338,18 +338,12 @@ wait:
 static int xlvbd_init_blk_queue(struct gendisk *gd, u16 sector_size)
 {
        struct request_queue *rq;
-       elevator_t *old_e;
 
        rq = blk_init_queue(do_blkif_request, &blkif_io_lock);
        if (rq == NULL)
                return -1;
 
-       old_e = rq->elevator;
-       if (IS_ERR_VALUE(elevator_init(rq, "noop")))
-               printk(KERN_WARNING
-                       "blkfront: Switch elevator failed, use default\n");
-       else
-               elevator_exit(old_e);
+       queue_flag_set_unlocked(QUEUE_FLAG_VIRT, rq);
 
        /* Hard sector size and max sectors impersonate the equiv. hardware. */
        blk_queue_hardsect_size(rq, sector_size);