md: raid1/raid10: fix problem with merge_bvec_fn
authorNeilBrown <neilb@suse.de>
Thu, 31 May 2012 05:39:11 +0000 (15:39 +1000)
committerNeilBrown <neilb@suse.de>
Thu, 31 May 2012 05:56:30 +0000 (15:56 +1000)
commitaba336bd1d46d6b0404b06f6915ed76150739057
tree6517e35ba3f6df77276d9c4e81d8ec726228aacd
parent2aa4ee2a8805ec0260dde971e9e6699917c868a7
md: raid1/raid10: fix problem with merge_bvec_fn

The new merge_bvec_fn which calls the corresponding function
in subsidiary devices requires that mddev->merge_check_needed
be set if any child has a merge_bvec_fn.

However were were only setting that when a device was hot-added,
not when a device was present from the start.

This bug was introduced in 3.4 so patch is suitable for 3.4.y
kernels.  However that are conflicts in raid10.c so a separate
patch will be needed for 3.4.y.

Cc: stable@vger.kernel.org
Reported-by: Sebastian Riemer <sebastian.riemer@profitbricks.com>
Signed-off-by: NeilBrown <neilb@suse.de>
drivers/md/raid1.c
drivers/md/raid10.c