summaryrefslogtreecommitdiffstats
path: root/drivers/md/raid10.c
diff options
context:
space:
mode:
author2005-05-26 07:47:10 +0200
committerJeff Garzik2005-05-26 07:47:10 +0200
commit949d33e70f2c3e93bfe5265a50e40175b1ab1ec1 (patch)
treeca88fd8f8f81b167dc4685ed34e9636f267db60d /drivers/md/raid10.c
parent[libata] ATA passthru (arbitrary ATA command execution) (diff)
parentMerge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff)
downloadkernel-qcow2-linux-949d33e70f2c3e93bfe5265a50e40175b1ab1ec1.tar.gz
kernel-qcow2-linux-949d33e70f2c3e93bfe5265a50e40175b1ab1ec1.tar.xz
kernel-qcow2-linux-949d33e70f2c3e93bfe5265a50e40175b1ab1ec1.zip
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git branch HEAD
Diffstat (limited to 'drivers/md/raid10.c')
-rw-r--r--drivers/md/raid10.c6
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...