aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-05-18 16:19:59 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-05-18 16:19:59 -0700
commit2f05af8b5943d5702ef555c91da93af99938be44 (patch)
treedd5de3120fcfa21ac25e1ff96871b765d0104ed7
parent8394edf3710b124793d46c51942a6392b7b569a0 (diff)
parentb0d634d5683f0b186b242ce6a4f3b041edb8b956 (diff)
downloadlinux-stericsson-2f05af8b5943d5702ef555c91da93af99938be44.tar.gz
Merge tag 'md-3.4-fixes' of git://neil.brown.name/md
Pull one more md bugfix from NeilBrown: "Fix bug in recent fix to RAID10. Without this patch, recovery will crash" * tag 'md-3.4-fixes' of git://neil.brown.name/md: md/raid10: fix transcription error in calc_sectors conversion.
-rw-r--r--drivers/md/raid10.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 3e7b1548111a..3f91c2e1dfe7 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -3189,7 +3189,7 @@ static void calc_sectors(struct r10conf *conf, sector_t size)
if (conf->far_offset)
conf->stride = 1 << conf->chunk_shift;
else {
- sector_div(size, conf->near_copies);
+ sector_div(size, conf->far_copies);
conf->stride = size << conf->chunk_shift;
}
}