Automatic merge of /spare/repo/netdev-2.6 branch we18

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index e9dc2876a626..3c37be6423d7 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -1639,9 +1639,6 @@ static int run(mddev_t *mddev)
                         mdname(mddev));
                 goto out_free_conf;
         }
-        mddev->queue->unplug_fn = raid10_unplug;
-
-        mddev->queue->issue_flush_fn = raid10_issue_flush;
 
         ITERATE_RDEV(mddev, rdev, tmp) {
                 disk_idx = rdev->raid_disk;
@@ -1713,6 +1710,9 @@ static int run(mddev_t *mddev)
         mddev->array_size = size/2;
         mddev->resync_max_sectors = size;
 
+        mddev->queue->unplug_fn = raid10_unplug;
+        mddev->queue->issue_flush_fn = raid10_issue_flush;
+
         /* Calculate max read-ahead size.
          * We need to readahead at least twice a whole stripe....
          * maybe...