mm/slub: don't wait for high-order page allocation

[linux-2.6-block.git] / drivers / md / dm-raid.c

diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c
index 2daa6779351179974f0a706f52de57dd722369ef..97e165183e79f2991f8191913e0b44fb91b00310 100644 (file)
--- a/drivers/md/dm-raid.c
+++ b/drivers/md/dm-raid.c
@@ -1717,24 +1717,6 @@ static void raid_resume(struct dm_target *ti)
        mddev_resume(&rs->md);
 }
 
-static int raid_merge(struct dm_target *ti, struct bvec_merge_data *bvm,
-                     struct bio_vec *biovec, int max_size)
-{
-       struct raid_set *rs = ti->private;
-       struct md_personality *pers = rs->md.pers;
-
-       if (pers && pers->mergeable_bvec)
-               return min(max_size, pers->mergeable_bvec(&rs->md, bvm, biovec));
-
-       /*
-        * In case we can't request the personality because
-        * the raid set is not running yet
-        *
-        * -> return safe minimum
-        */
-       return rs->md.chunk_sectors;
-}
-
 static struct target_type raid_target = {
        .name = "raid",
        .version = {1, 7, 0},
@@ -1749,7 +1731,6 @@ static struct target_type raid_target = {
        .presuspend = raid_presuspend,
        .postsuspend = raid_postsuspend,
        .resume = raid_resume,
-       .merge = raid_merge,
 };
 
 static int __init dm_raid_init(void)