md: revise Kconfig help for MD_MULTIPATH

[safe/jmp/linux-2.6] / drivers / block / osdblk.c

diff --git a/drivers/block/osdblk.c b/drivers/block/osdblk.c
index 3565d0d..a808b15 100644 (file)
--- a/drivers/block/osdblk.c
+++ b/drivers/block/osdblk.c
@@ -66,6 +66,7 @@
 #include <scsi/osd_initiator.h>
 #include <scsi/osd_attributes.h>
 #include <scsi/osd_sec.h>
+#include <scsi/scsi_device.h>
 
 #define DRV_NAME "osdblk"
 #define PFX DRV_NAME ": "
@@ -124,7 +125,7 @@ static struct class *class_osdblk;          /* /sys/class/osdblk */
 static DEFINE_MUTEX(ctl_mutex);        /* Serialize open/close/setup/teardown */
 static LIST_HEAD(osdblkdev_list);
 
-static struct block_device_operations osdblk_bd_ops = {
+static const struct block_device_operations osdblk_bd_ops = {
        .owner          = THIS_MODULE,
 };
 
@@ -437,6 +438,12 @@ static int osdblk_init_disk(struct osdblk_device *osdev)
                return rc;
        }
 
+       /* Set our limits to the lower device limits, because osdblk cannot
+        * sleep when allocating a lower-request and therefore cannot be
+        * bouncing.
+        */
+       blk_queue_stack_limits(q, osd_request_queue(osdev->osd));
+
        blk_queue_prep_rq(q, blk_queue_start_tag);
        blk_queue_ordered(q, QUEUE_ORDERED_DRAIN_FLUSH, osdblk_prepare_flush);