Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

md: move test for whether level supports bitmap to correct place 



We need to check for internal-consistency of superblock in load_super.
validate_super is for inter-device consistency.

With the test in the wrong place, a badly created array will confuse md rather
an produce sensible errors.

Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c3f94b40

drivers/md/md.c

+26 −16
Original line number Diff line number Diff line
@@ -695,6 +695,17 @@ static int super_90_load(mdk_rdev_t *rdev, mdk_rdev_t *refdev, int minor_version 
	rdev->data_offset = 0;

	rdev->sb_size = MD_SB_BYTES;



	if (sb->state & (1<<MD_SB_BITMAP_PRESENT)) {

		if (sb->level != 1 && sb->level != 4

		    && sb->level != 5 && sb->level != 6

		    && sb->level != 10) {

			/* FIXME use a better test */

			printk(KERN_WARNING

			       "md: bitmaps not supported for this level.\n");

			goto abort;

		}

	}



	if (sb->level == LEVEL_MULTIPATH)

		rdev->desc_nr = -1;

	else
@@ -793,16 +804,8 @@ static int super_90_validate(mddev_t *mddev, mdk_rdev_t *rdev) 
		mddev->max_disks = MD_SB_DISKS;



		if (sb->state & (1<<MD_SB_BITMAP_PRESENT) &&

		    mddev->bitmap_file == NULL) {

			if (mddev->level != 1 && mddev->level != 4

			    && mddev->level != 5 && mddev->level != 6

			    && mddev->level != 10) {

				/* FIXME use a better test */

				printk(KERN_WARNING "md: bitmaps not supported for this level.\n");

				return -EINVAL;

			}

		    mddev->bitmap_file == NULL)

			mddev->bitmap_offset = mddev->default_bitmap_offset;

		}



	} else if (mddev->pers == NULL) {

		/* Insist on good event counter while assembling */
@@ -1059,6 +1062,18 @@ static int super_1_load(mdk_rdev_t *rdev, mdk_rdev_t *refdev, int minor_version) 
		       bdevname(rdev->bdev,b));

		return -EINVAL;

	}

	if ((le32_to_cpu(sb->feature_map) & MD_FEATURE_BITMAP_OFFSET)) {

		if (sb->level != cpu_to_le32(1) &&

		    sb->level != cpu_to_le32(4) &&

		    sb->level != cpu_to_le32(5) &&

		    sb->level != cpu_to_le32(6) &&

		    sb->level != cpu_to_le32(10)) {

			printk(KERN_WARNING

			       "md: bitmaps not supported for this level.\n");

			return -EINVAL;

		}

	}



	rdev->preferred_minor = 0xffff;

	rdev->data_offset = le64_to_cpu(sb->data_offset);

	atomic_set(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
@@ -1142,14 +1157,9 @@ static int super_1_validate(mddev_t *mddev, mdk_rdev_t *rdev) 
		mddev->max_disks =  (4096-256)/2;



		if ((le32_to_cpu(sb->feature_map) & MD_FEATURE_BITMAP_OFFSET) &&

		    mddev->bitmap_file == NULL ) {

			if (mddev->level != 1 && mddev->level != 5 && mddev->level != 6

			    && mddev->level != 10) {

				printk(KERN_WARNING "md: bitmaps not supported for this level.\n");

				return -EINVAL;

			}

		    mddev->bitmap_file == NULL )

			mddev->bitmap_offset = (__s32)le32_to_cpu(sb->bitmap_offset);

		}



		if ((le32_to_cpu(sb->feature_map) & MD_FEATURE_RESHAPE_ACTIVE)) {

			mddev->reshape_position = le64_to_cpu(sb->reshape_position);

			mddev->delta_disks = le32_to_cpu(sb->delta_disks);