Merge tag 'md-3.4-fixes' of git://neil.brown.name/md
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 May 2012 23:19:59 +0000 (16:19 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 May 2012 23:19:59 +0000 (16:19 -0700)
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.

drivers/md/raid10.c

index 3e7b154..3f91c2e 100644 (file)
@@ -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;
        }
 }