Merge tag 'v2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / block / osdblk.c

diff --git a/drivers/block/osdblk.c b/drivers/block/osdblk.c
index 2284b4f05c62f44b179aa22e955a24cd22a1744d..87311ebac0db4e5cc3f04fe0e255bf01d62aa730 100644 (file)
--- a/drivers/block/osdblk.c
+++ b/drivers/block/osdblk.c
@@ -310,8 +310,7 @@ static void osdblk_rq_fn(struct request_queue *q)
                        break;
 
                /* filter out block requests we don't understand */
-               if (rq->cmd_type != REQ_TYPE_FS &&
-                   !(rq->cmd_flags & REQ_HARDBARRIER)) {
+               if (rq->cmd_type != REQ_TYPE_FS) {
                        blk_end_request_all(rq, 0);
                        continue;
                }
@@ -439,7 +438,7 @@ static int osdblk_init_disk(struct osdblk_device *osdev)
        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);
+       blk_queue_flush(q, REQ_FLUSH);
 
        disk->queue = q;