2 files changed, 4 insertions, 1 deletions

diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index b1ce5dc7c603..e181e405e244 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -684,6 +684,9 @@ static int is_valid_state(struct drbd_conf *mdev, union drbd_state ns)
         else if (ns.conn > C_CONNECTED && ns.pdsk < D_INCONSISTENT)
                 rv = SS_NO_REMOTE_DISK;
 
+        else if (ns.conn > C_CONNECTED && ns.disk < D_UP_TO_DATE && ns.pdsk < D_UP_TO_DATE)
+                rv = SS_NO_UP_TO_DATE_DISK;
+
         else if ((ns.conn == C_CONNECTED ||
                   ns.conn == C_WF_BITMAP_S ||
                   ns.conn == C_SYNC_SOURCE ||
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",