---

yaml --- r: 360741 b: refs/heads/master c: a646853 h: refs/heads/master i: 360739: 0537315 v: v3
git-mirror · Feb 26, 2013 · 34c088f · 34c088f
1 parent d42920e
commit 34c088f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe5d2f4a15967bbe907e7b3e31e49dae7af7cc6b
+refs/heads/master: a64685399181780998281fe07309a94b25dd24c3
diff --git a/trunk/drivers/md/md.c b/trunk/drivers/md/md.c
@@ -2998,6 +2998,9 @@ rdev_size_store(struct md_rdev *rdev, const char *buf, size_t len)
 		} else if (!sectors)
 			sectors = (i_size_read(rdev->bdev->bd_inode) >> 9) -
 				rdev->data_offset;
+		if (!my_mddev->pers->resize)
+			/* Cannot change size for RAID0 or Linear etc */
+			return -EINVAL;
 	}
 	if (sectors < my_mddev->dev_sectors)
 		return -EINVAL; /* component must fit device */

diff --git a/trunk/drivers/md/raid0.c b/trunk/drivers/md/raid0.c
@@ -411,7 +411,8 @@ static sector_t raid0_size(struct mddev *mddev, sector_t sectors, int raid_disks
 		  "%s does not support generic reshape\n", __func__);
 
 	rdev_for_each(rdev, mddev)
-		array_sectors += rdev->sectors;
+		array_sectors += (rdev->sectors &
+				  ~(sector_t)(mddev->chunk_sectors-1));
 
 	return array_sectors;
 }