diff --git a/[refs] b/[refs] index 5e9f3782a9c6..13598d14c7b5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 88ce4930e2b80378d45506ce2c3bb5820e156e85 +refs/heads/master: d1a7c50369835f9ecbd7752016cd9302ecfae678 diff --git a/trunk/drivers/md/md.c b/trunk/drivers/md/md.c index c50931352b23..2be574c0a27a 100644 --- a/trunk/drivers/md/md.c +++ b/trunk/drivers/md/md.c @@ -2888,6 +2888,8 @@ __ATTR(chunk_size, S_IRUGO|S_IWUSR, chunk_size_show, chunk_size_store); static ssize_t resync_start_show(mddev_t *mddev, char *page) { + if (mddev->recovery_cp == MaxSector) + return sprintf(page, "none\n"); return sprintf(page, "%llu\n", (unsigned long long)mddev->recovery_cp); } @@ -3469,6 +3471,8 @@ static ssize_t sync_speed_show(mddev_t *mddev, char *page) { unsigned long resync, dt, db; + if (mddev->curr_resync == 0) + return sprintf(page, "none\n"); resync = mddev->curr_mark_cnt - atomic_read(&mddev->recovery_active); dt = (jiffies - mddev->resync_mark) / HZ; if (!dt) dt++;