From: NeilBrown Sometimes it doesn't so make the code more like the version-0 code which works. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton --- drivers/md/md.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff -puN drivers/md/md.c~md-make-sure-rdev-size-gets-set-for-version-1-superblocks drivers/md/md.c --- 25/drivers/md/md.c~md-make-sure-rdev-size-gets-set-for-version-1-superblocks Thu Feb 2 16:19:58 2006 +++ 25-akpm/drivers/md/md.c Thu Feb 2 16:19:58 2006 @@ -1024,7 +1024,7 @@ static int super_1_load(mdk_rdev_t *rdev rdev-> sb_size = (rdev->sb_size | bmask)+1; if (refdev == 0) - return 1; + ret = 1; else { __u64 ev1, ev2; struct mdp_superblock_1 *refsb = @@ -1044,7 +1044,9 @@ static int super_1_load(mdk_rdev_t *rdev ev2 = le64_to_cpu(refsb->events); if (ev1 > ev2) - return 1; + ret = 1; + else + ret = 0; } if (minor_version) rdev->size = ((rdev->bdev->bd_inode->i_size>>9) - le64_to_cpu(sb->data_offset)) / 2; @@ -1058,7 +1060,7 @@ static int super_1_load(mdk_rdev_t *rdev if (le32_to_cpu(sb->size) > rdev->size*2) return -EINVAL; - return 0; + return ret; } static int super_1_validate(mddev_t *mddev, mdk_rdev_t *rdev) _