From 1334c04516d19b55eb721fc65393218862d16ba9 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Wed, 11 May 2011 15:52:21 +1000 Subject: [PATCH] --- yaml --- r: 247884 b: refs/heads/master c: b098636cf04c89db4036fedc778da0acc666ad1a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/md/md.c | 2 +- trunk/drivers/md/raid1.c | 2 +- trunk/drivers/md/raid5.c | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1b580f3ade69..eb5b7a0231d4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ab9d47e990c12c11cc95ed1247a3782234a7e33a +refs/heads/master: b098636cf04c89db4036fedc778da0acc666ad1a diff --git a/trunk/drivers/md/md.c b/trunk/drivers/md/md.c index 5469ae35ee15..aa640a85bb21 100644 --- a/trunk/drivers/md/md.c +++ b/trunk/drivers/md/md.c @@ -3324,7 +3324,7 @@ resync_start_store(mddev_t *mddev, const char *buf, size_t len) char *e; unsigned long long n = simple_strtoull(buf, &e, 10); - if (mddev->pers) + if (mddev->pers && !test_bit(MD_RECOVERY_FROZEN, &mddev->recovery)) return -EBUSY; if (cmd_match(buf, "none")) n = MaxSector; diff --git a/trunk/drivers/md/raid1.c b/trunk/drivers/md/raid1.c index 779abbd2bb1d..5d096096f958 100644 --- a/trunk/drivers/md/raid1.c +++ b/trunk/drivers/md/raid1.c @@ -2061,7 +2061,7 @@ static int raid1_resize(mddev_t *mddev, sector_t sectors) set_capacity(mddev->gendisk, mddev->array_sectors); revalidate_disk(mddev->gendisk); if (sectors > mddev->dev_sectors && - mddev->recovery_cp == MaxSector) { + mddev->recovery_cp > mddev->dev_sectors) { mddev->recovery_cp = mddev->dev_sectors; set_bit(MD_RECOVERY_NEEDED, &mddev->recovery); } diff --git a/trunk/drivers/md/raid5.c b/trunk/drivers/md/raid5.c index 51af7f3bfe52..34dd54539f7b 100644 --- a/trunk/drivers/md/raid5.c +++ b/trunk/drivers/md/raid5.c @@ -5389,7 +5389,8 @@ static int raid5_resize(mddev_t *mddev, sector_t sectors) return -EINVAL; set_capacity(mddev->gendisk, mddev->array_sectors); revalidate_disk(mddev->gendisk); - if (sectors > mddev->dev_sectors && mddev->recovery_cp == MaxSector) { + if (sectors > mddev->dev_sectors && + mddev->recovery_cp > mddev->dev_sectors) { mddev->recovery_cp = mddev->dev_sectors; set_bit(MD_RECOVERY_NEEDED, &mddev->recovery); }