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

Commit 7d3c6f87 authored by Chris Webb's avatar Chris Webb Committed by NeilBrown
Browse files

md: Fix rdev_size_store with size == 0 




Fix rdev_size_store with size == 0.
size == 0 means to use the largest size allowed by the
underlying device and is used when modifying an active array.

This fixes a regression introduced by
 commit d7027458

Cc: <stable@kernel.org>
Signed-off-by: default avatarChris Webb <chris@arachsys.com>
Signed-off-by: default avatarNeilBrown <neilb@suse.de>
parent fd048088

drivers/md/md.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -2106,8 +2106,6 @@ rdev_size_store(mdk_rdev_t *rdev, const char *buf, size_t len) 




	if (strict_strtoull(buf, 10, &size) < 0)

	if (strict_strtoull(buf, 10, &size) < 0)

		return -EINVAL;

		return -EINVAL;

	if (size < my_mddev->size)

		return -EINVAL;

	if (my_mddev->pers && rdev->raid_disk >= 0) {

	if (my_mddev->pers && rdev->raid_disk >= 0) {

		if (my_mddev->persistent) {

		if (my_mddev->persistent) {

			size = super_types[my_mddev->major_version].

			size = super_types[my_mddev->major_version].
@@ -2118,9 +2116,9 @@ rdev_size_store(mdk_rdev_t *rdev, const char *buf, size_t len) 
			size = (rdev->bdev->bd_inode->i_size >> 10);

			size = (rdev->bdev->bd_inode->i_size >> 10);

			size -= rdev->data_offset/2;

			size -= rdev->data_offset/2;

		}

		}

	}

	if (size < my_mddev->size)

	if (size < my_mddev->size)

		return -EINVAL; /* component must fit device */

		return -EINVAL; /* component must fit device */

	}





	rdev->size = size;

	rdev->size = size;

	if (size > oldsize && my_mddev->external) {

	if (size > oldsize && my_mddev->external) {