X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=block%2Fblk-settings.c;h=5d21239bc8599feb3fa12fa4906ba57aaf1c553f;hb=HEAD;hp=05e826793e4e36b2e6c8de29802674767e3bd4d8;hpb=9451ee2d17e6b4bfbc5871f3c86ea744581b0413;p=~andy%2Flinux

diff --git a/block/blk-settings.c b/block/blk-settings.c
index 05e826793e4..5d21239bc85 100644
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@ -592,6 +592,10 @@ int blk_stack_limits(struct queue_limits *t, struct queue_limits *b,
 		ret = -1;
 	}
 
+	t->raid_partial_stripes_expensive =
+		max(t->raid_partial_stripes_expensive,
+		    b->raid_partial_stripes_expensive);
+
 	/* Find lowest common alignment_offset */
 	t->alignment_offset = lcm(t->alignment_offset, alignment)
 		& (max(t->physical_block_size, t->io_min) - 1);