diff options
| author | David S. Miller <davem@davemloft.net> | 2011-02-20 04:17:35 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-20 04:17:35 +0100 |
| commit | da935c66bacb3ed9ada984b053297f87c2dff63a (patch) | |
| tree | 46278da2b312c73f1375b830d7e5912bf23abd78 /drivers/md/raid10.c | |
| parent | ipv4: Implement __ip_dev_find using new interface address hash. (diff) | |
| parent | sctp: fix reporting of unknown parameters (diff) | |
| download | linux-da935c66bacb3ed9ada984b053297f87c2dff63a.tar.xz linux-da935c66bacb3ed9ada984b053297f87c2dff63a.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/e1000e/netdev.c
net/xfrm/xfrm_policy.c
Diffstat (limited to 'drivers/md/raid10.c')
| -rw-r--r-- | drivers/md/raid10.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index 69b659544390..3b607b28741b 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c @@ -2463,11 +2463,13 @@ static void *raid10_takeover_raid0(mddev_t *mddev) mddev->recovery_cp = MaxSector; conf = setup_conf(mddev); - if (!IS_ERR(conf)) + if (!IS_ERR(conf)) { list_for_each_entry(rdev, &mddev->disks, same_set) if (rdev->raid_disk >= 0) rdev->new_raid_disk = rdev->raid_disk * 2; - + conf->barrier = 1; + } + return conf; } |