aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/md/md.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/md/md.c')
-rw-r--r--drivers/md/md.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 653d4dcbee23..8f161743e18f 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -2942,6 +2942,8 @@ static int get_array_info(mddev_t * mddev, void __user * arg)
2942 info.ctime = mddev->ctime; 2942 info.ctime = mddev->ctime;
2943 info.level = mddev->level; 2943 info.level = mddev->level;
2944 info.size = mddev->size; 2944 info.size = mddev->size;
2945 if (info.size != mddev->size) /* overflow */
2946 info.size = -1;
2945 info.nr_disks = nr; 2947 info.nr_disks = nr;
2946 info.raid_disks = mddev->raid_disks; 2948 info.raid_disks = mddev->raid_disks;
2947 info.md_minor = mddev->md_minor; 2949 info.md_minor = mddev->md_minor;
@@ -3523,7 +3525,7 @@ static int update_array_info(mddev_t *mddev, mdu_array_info_t *info)
3523 ) 3525 )
3524 return -EINVAL; 3526 return -EINVAL;
3525 /* Check there is only one change */ 3527 /* Check there is only one change */
3526 if (mddev->size != info->size) cnt++; 3528 if (info->size >= 0 && mddev->size != info->size) cnt++;
3527 if (mddev->raid_disks != info->raid_disks) cnt++; 3529 if (mddev->raid_disks != info->raid_disks) cnt++;
3528 if (mddev->layout != info->layout) cnt++; 3530 if (mddev->layout != info->layout) cnt++;
3529 if ((state ^ info->state) & (1<<MD_SB_BITMAP_PRESENT)) cnt++; 3531 if ((state ^ info->state) & (1<<MD_SB_BITMAP_PRESENT)) cnt++;
@@ -3540,7 +3542,7 @@ static int update_array_info(mddev_t *mddev, mdu_array_info_t *info)
3540 else 3542 else
3541 return mddev->pers->reconfig(mddev, info->layout, -1); 3543 return mddev->pers->reconfig(mddev, info->layout, -1);
3542 } 3544 }
3543 if (mddev->size != info->size) 3545 if (info->size >= 0 && mddev->size != info->size)
3544 rv = update_size(mddev, info->size); 3546 rv = update_size(mddev, info->size);
3545 3547
3546 if (mddev->raid_disks != info->raid_disks) 3548 if (mddev->raid_disks != info->raid_disks)