Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm

[pandora-kernel.git] / drivers / md / dm-stripe.c

diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
index dddfa14..3d80cf0 100644 (file)
--- a/drivers/md/dm-stripe.c
+++ b/drivers/md/dm-stripe.c
@@ -396,9 +396,29 @@ static void stripe_io_hints(struct dm_target *ti,
        blk_limits_io_opt(limits, chunk_size * sc->stripes);
 }
 
+static int stripe_merge(struct dm_target *ti, struct bvec_merge_data *bvm,
+                       struct bio_vec *biovec, int max_size)
+{
+       struct stripe_c *sc = ti->private;
+       sector_t bvm_sector = bvm->bi_sector;
+       uint32_t stripe;
+       struct request_queue *q;
+
+       stripe_map_sector(sc, bvm_sector, &stripe, &bvm_sector);
+
+       q = bdev_get_queue(sc->stripe[stripe].dev->bdev);
+       if (!q->merge_bvec_fn)
+               return max_size;
+
+       bvm->bi_bdev = sc->stripe[stripe].dev->bdev;
+       bvm->bi_sector = sc->stripe[stripe].physical_start + bvm_sector;
+
+       return min(max_size, q->merge_bvec_fn(q, bvm, biovec));
+}
+
 static struct target_type stripe_target = {
        .name   = "striped",
-       .version = {1, 3, 1},
+       .version = {1, 4, 0},
        .module = THIS_MODULE,
        .ctr    = stripe_ctr,
        .dtr    = stripe_dtr,
@@ -407,6 +427,7 @@ static struct target_type stripe_target = {
        .status = stripe_status,
        .iterate_devices = stripe_iterate_devices,
        .io_hints = stripe_io_hints,
+       .merge  = stripe_merge,
 };
 
 int __init dm_stripe_init(void)