Skip to content

Commit

Permalink
md: Fix rdev_size_store with size == 0
Browse files Browse the repository at this point in the history
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 d702745

Cc: <stable@kernel.org>
Signed-off-by: Chris Webb <chris@arachsys.com>
Signed-off-by: NeilBrown <neilb@suse.de>
  • Loading branch information
Chris Webb authored and NeilBrown committed Oct 13, 2008
1 parent fd04808 commit 7d3c6f8
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions drivers/md/md.c
Original file line number Diff line number Diff line change
Expand Up @@ -2106,8 +2106,6 @@ rdev_size_store(mdk_rdev_t *rdev, const char *buf, size_t len)

if (strict_strtoull(buf, 10, &size) < 0)
return -EINVAL;
if (size < my_mddev->size)
return -EINVAL;
if (my_mddev->pers && rdev->raid_disk >= 0) {
if (my_mddev->persistent) {
size = super_types[my_mddev->major_version].
Expand All @@ -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->data_offset/2;
}
if (size < my_mddev->size)
return -EINVAL; /* component must fit device */
}
if (size < my_mddev->size)
return -EINVAL; /* component must fit device */

rdev->size = size;
if (size > oldsize && my_mddev->external) {
Expand Down

0 comments on commit 7d3c6f8

Please sign in to comment.