Commit 8ed75463 authored by NeilBrown's avatar NeilBrown Committed by Linus Torvalds
Browse files

[PATCH] md: Make sure rdev->size gets set for version-1 superblocks 



Sometimes it doesn't so make the code more like the version-0 code which
works.

Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 29fc7e3e

drivers/md/md.c

+5 −3
Original line number Diff line number Diff line
@@ -1024,7 +1024,7 @@ static int super_1_load(mdk_rdev_t *rdev, mdk_rdev_t *refdev, int minor_version) 
		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, mdk_rdev_t *refdev, int minor_version) 
		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, mdk_rdev_t *refdev, int minor_version) 


	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)