summaryrefslogtreecommitdiffstats
path: root/drivers/block/drbd/drbd_strings.c
diff options
context:
space:
mode:
authorLars Ellenberg <lars.ellenberg@linbit.com>2010-04-01 16:59:32 +0200
committerPhilipp Reisner <philipp.reisner@linbit.com>2010-05-18 01:08:18 +0200
commit8d4ce82b3ccd755c8ba401469ced5286b1e02284 (patch)
tree9cd1b789104e4570294893856b49d3fb150379b5 /drivers/block/drbd/drbd_strings.c
parentc3470cde57ea34d9b4bd34891ec040e46b9fb3bf (diff)
downloadlinux-stable-8d4ce82b3ccd755c8ba401469ced5286b1e02284.tar.gz
linux-stable-8d4ce82b3ccd755c8ba401469ced5286b1e02284.tar.bz2
linux-stable-8d4ce82b3ccd755c8ba401469ced5286b1e02284.zip
drbd: don't start a resync without access to up-to-date Data
In case both nodes are "inconsistent", invalidate would have started a resync anyways, without a chance to ever succeed, just filling the logs with warning messages. Simply disallow that state change, re-using the SS_NO_UP_TO_DATE_DISK return value. This also changes the corresponding error string to "Need access to UpToDate Data" -- I found the "Refusing to be Primary without at least one UpToDate disk" answer misleading in some situations anyways. Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_strings.c')
-rw-r--r--drivers/block/drbd/drbd_strings.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_strings.c b/drivers/block/drbd/drbd_strings.c
index 76863e3f05be..85179e1fb50a 100644
--- a/drivers/block/drbd/drbd_strings.c
+++ b/drivers/block/drbd/drbd_strings.c
@@ -70,7 +70,7 @@ static const char *drbd_disk_s_names[] = {
static const char *drbd_state_sw_errors[] = {
[-SS_TWO_PRIMARIES] = "Multiple primaries not allowed by config",
- [-SS_NO_UP_TO_DATE_DISK] = "Refusing to be Primary without at least one UpToDate disk",
+ [-SS_NO_UP_TO_DATE_DISK] = "Need access to UpToDate data",
[-SS_NO_LOCAL_DISK] = "Can not resync without local disk",
[-SS_NO_REMOTE_DISK] = "Can not resync without remote disk",
[-SS_CONNECTED_OUTDATES] = "Refusing to be Outdated while Connected",