aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAndre Noll <maan@systemlinux.org>2009-06-17 18:48:06 -0400
committerNeilBrown <neilb@suse.de>2009-06-17 18:48:06 -0400
commit8c6ac868b107ed50a46204f6d14e2ad9443ff146 (patch)
treea0690ce92ed1993cc3211448948f3964c389c082 /drivers
parent50ac168a6e0a061bf5346d53aa9e7beb94c97527 (diff)
md: Push down reconstruction log message to personality code.
Currently, the md layer checks in analyze_sbs() if the raid level supports reconstruction (mddev->level >= 1) and if reconstruction is in progress (mddev->recovery_cp != MaxSector). Move that printk into the personality code of those raid levels that care (levels 1, 4, 5, 6, 10). Signed-off-by: Andre Noll <maan@systemlinux.org> Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/md/md.c9
-rw-r--r--drivers/md/raid1.c4
-rw-r--r--drivers/md/raid10.c4
-rw-r--r--drivers/md/raid5.c4
4 files changed, 12 insertions, 9 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 80f039ec3ac2..90147370bfd7 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -2604,15 +2604,6 @@ static void analyze_sbs(mddev_t * mddev)
2604 clear_bit(In_sync, &rdev->flags); 2604 clear_bit(In_sync, &rdev->flags);
2605 } 2605 }
2606 } 2606 }
2607
2608
2609
2610 if (mddev->recovery_cp != MaxSector &&
2611 mddev->level >= 1)
2612 printk(KERN_ERR "md: %s: raid array is not clean"
2613 " -- starting background reconstruction\n",
2614 mdname(mddev));
2615
2616} 2607}
2617 2608
2618static void md_safemode_timeout(unsigned long data); 2609static void md_safemode_timeout(unsigned long data);
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 12f8f34f17ae..89939a7aef57 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -2052,6 +2052,10 @@ static int run(mddev_t *mddev)
2052 goto out_free_conf; 2052 goto out_free_conf;
2053 } 2053 }
2054 2054
2055 if (mddev->recovery_cp != MaxSector)
2056 printk(KERN_NOTICE "raid1: %s is not clean"
2057 " -- starting background reconstruction\n",
2058 mdname(mddev));
2055 printk(KERN_INFO 2059 printk(KERN_INFO
2056 "raid1: raid set %s active with %d out of %d mirrors\n", 2060 "raid1: raid set %s active with %d out of %d mirrors\n",
2057 mdname(mddev), mddev->raid_disks - mddev->degraded, 2061 mdname(mddev), mddev->raid_disks - mddev->degraded,
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 30029a312cf5..ae12ceafe10c 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -2186,6 +2186,10 @@ static int run(mddev_t *mddev)
2186 goto out_free_conf; 2186 goto out_free_conf;
2187 } 2187 }
2188 2188
2189 if (mddev->recovery_cp != MaxSector)
2190 printk(KERN_NOTICE "raid10: %s is not clean"
2191 " -- starting background reconstruction\n",
2192 mdname(mddev));
2189 printk(KERN_INFO 2193 printk(KERN_INFO
2190 "raid10: raid set %s active with %d out of %d devices\n", 2194 "raid10: raid set %s active with %d out of %d devices\n",
2191 mdname(mddev), mddev->raid_disks - mddev->degraded, 2195 mdname(mddev), mddev->raid_disks - mddev->degraded,
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 5ea2bdece278..8f2e3740a05a 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -4454,6 +4454,10 @@ static int run(mddev_t *mddev)
4454 int working_disks = 0; 4454 int working_disks = 0;
4455 mdk_rdev_t *rdev; 4455 mdk_rdev_t *rdev;
4456 4456
4457 if (mddev->recovery_cp != MaxSector)
4458 printk(KERN_NOTICE "raid5: %s is not clean"
4459 " -- starting background reconstruction\n",
4460 mdname(mddev));
4457 if (mddev->reshape_position != MaxSector) { 4461 if (mddev->reshape_position != MaxSector) {
4458 /* Check that we can continue the reshape. 4462 /* Check that we can continue the reshape.
4459 * Currently only disks can change, it must 4463 * Currently only disks can change, it must