From 8e30ce39cd6c3430005f025b05010874eb0f2704 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Tue, 5 Aug 2008 15:54:13 +1000 Subject: [PATCH] --- yaml --- r: 108523 b: refs/heads/master c: dba034eef2456d2a9f9a76806846c97acf6c3ad1 h: refs/heads/master i: 108521: cf543236d5a668e3bd3c97fadc0bf027f10e2645 108519: e012ed1d11fc7e14cab767fe15bf38c08f8f7cb5 v: v3 --- [refs] | 2 +- trunk/drivers/md/md.c | 5 +++++ trunk/drivers/md/raid5.c | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e09fc927f1e7..f09c52aca76a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2b25000bf5157c28d8591f03f0575248a8cbd900 +refs/heads/master: dba034eef2456d2a9f9a76806846c97acf6c3ad1 diff --git a/trunk/drivers/md/md.c b/trunk/drivers/md/md.c index 8d11cd1a0d8b..6eb95451f161 100644 --- a/trunk/drivers/md/md.c +++ b/trunk/drivers/md/md.c @@ -4639,6 +4639,11 @@ static int update_size(mddev_t *mddev, sector_t num_sectors) */ if (mddev->sync_thread) return -EBUSY; + if (mddev->bitmap) + /* Sorry, cannot grow a bitmap yet, just remove it, + * grow, and re-add. + */ + return -EBUSY; rdev_for_each(rdev, tmp, mddev) { sector_t avail; avail = rdev->size * 2; diff --git a/trunk/drivers/md/raid5.c b/trunk/drivers/md/raid5.c index 40e939675657..17e0953c3c06 100644 --- a/trunk/drivers/md/raid5.c +++ b/trunk/drivers/md/raid5.c @@ -4446,6 +4446,9 @@ static int raid5_check_reshape(mddev_t *mddev) return -EINVAL; /* Cannot shrink array or change level yet */ if (mddev->delta_disks == 0) return 0; /* nothing to do */ + if (mddev->bitmap) + /* Cannot grow a bitmap yet */ + return -EBUSY; /* Can only proceed if there are plenty of stripe_heads. * We need a minimum of one full stripe,, and for sensible progress