vserver 1.9.3

[linux-2.6.git] / drivers / md / linear.c

diff --git a/drivers/md/linear.c b/drivers/md/linear.c
index e0aa017..0f57e5e 100644 (file)
--- a/drivers/md/linear.c
+++ b/drivers/md/linear.c
@@ -47,7 +47,6 @@ static inline dev_info_t *which_dev(mddev_t *mddev, sector_t sector)
                return hash->dev0;
 }
 
-
 /**
  *     linear_mergeable_bvec -- tell bio layer if a two requests can be merged
  *     @q: request queue
@@ -93,6 +92,27 @@ static void linear_unplug(request_queue_t *q)
        }
 }
 
+static int linear_issue_flush(request_queue_t *q, struct gendisk *disk,
+                             sector_t *error_sector)
+{
+       mddev_t *mddev = q->queuedata;
+       linear_conf_t *conf = mddev_to_conf(mddev);
+       int i, ret = 0;
+
+       for (i=0; i < mddev->raid_disks; i++) {
+               struct block_device *bdev = conf->disks[i].rdev->bdev;
+               request_queue_t *r_queue = bdev_get_queue(bdev);
+
+               if (!r_queue->issue_flush_fn) {
+                       ret = -EOPNOTSUPP;
+                       break;
+               }
+               ret = r_queue->issue_flush_fn(r_queue, bdev->bd_disk, error_sector);
+               if (ret)
+                       break;
+       }
+       return ret;
+}
 
 static int linear_run (mddev_t *mddev)
 {
@@ -137,7 +157,7 @@ static int linear_run (mddev_t *mddev)
                 */
                if (rdev->bdev->bd_disk->queue->merge_bvec_fn &&
                    mddev->queue->max_sectors > (PAGE_SIZE>>9))
-                       mddev->queue->max_sectors = (PAGE_SIZE>>9);
+                       blk_queue_max_sectors(mddev->queue, PAGE_SIZE>>9);
 
                disk->size = rdev->size;
                mddev->array_size += rdev->size;
@@ -200,6 +220,7 @@ static int linear_run (mddev_t *mddev)
 
        blk_queue_merge_bvec(mddev->queue, linear_mergeable_bvec);
        mddev->queue->unplug_fn = linear_unplug;
+       mddev->queue->issue_flush_fn = linear_issue_flush;
        return 0;
 
 out: